OSDN Git Service

am daf5e22d: Add new embedded target for a super minimal android build
authorMike Lockwood <lockwood@google.com>
Fri, 26 Oct 2012 15:45:36 +0000 (08:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 26 Oct 2012 15:45:36 +0000 (08:45 -0700)
* commit 'daf5e22dbac03e174e22c8209ed97c44c3a2a2c9':
  Add new embedded target for a super minimal android build

1  2 
core/Makefile
core/main.mk
target/product/core.mk

diff --cc core/Makefile
Simple merge
diff --cc core/main.mk
Simple merge
@@@ -129,20 -129,11 +129,16 @@@ PRODUCT_PACKAGES += 
      lint \
      uiautomator \
      telephony-common \
 -    mms-common \
 -    zoneinfo.dat \
 -    zoneinfo.idx \
 -    zoneinfo.version
 +    mms-common
 +
 +# SELinux packages
 +PRODUCT_PACKAGES += \
 +    sepolicy \
 +    file_contexts \
 +    seapp_contexts \
 +    property_contexts \
 +    mac_permissions.xml
  
- PRODUCT_COPY_FILES += \
-     system/core/rootdir/init.usb.rc:root/init.usb.rc \
-     system/core/rootdir/init.trace.rc:root/init.trace.rc \
  # host-only dependencies
  ifeq ($(WITH_HOST_DALVIK),true)
      PRODUCT_PACKAGES += \