diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:07:58 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:07:58 +0000 |
| commit | 766a518ae6de4b81c4fc139f90b51521a2f681b7 (patch) | |
| tree | e694616b3a0c42642ed38f396cba9ba5e5ff8671 /target | |
| parent | 5cd236c279a16120cabc9e334285277f9e79f213 (diff) | |
| parent | 358c8909f5dd043f9d8bfee61f567701946dc19a (diff) | |
| download | build-766a518ae6de4b81c4fc139f90b51521a2f681b7.zip build-766a518ae6de4b81c4fc139f90b51521a2f681b7.tar.gz build-766a518ae6de4b81c4fc139f90b51521a2f681b7.tar.bz2 | |
Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
Conflicts:
core/Makefile
core/build_id.mk
tools/releasetools/ota_from_target_files.py
Change-Id: Ia1404ee9cd931a6540ea0dd3e2aa7b32d649e80c
Diffstat (limited to 'target')
| -rw-r--r-- | target/product/base.mk | 1 | ||||
| -rw-r--r-- | target/product/embedded.mk | 1 | ||||
| -rw-r--r-- | target/product/emulator.mk | 1 | ||||
| -rw-r--r-- | target/product/full_base.mk | 3 | ||||
| -rw-r--r-- | target/product/vboot.mk | 1 |
5 files changed, 4 insertions, 3 deletions
diff --git a/target/product/base.mk b/target/product/base.mk index 4ad0d25..a9610d1 100644 --- a/target/product/base.mk +++ b/target/product/base.mk @@ -111,6 +111,7 @@ PRODUCT_PACKAGES += \ run-as \ schedtest \ sdcard \ + secdiscard \ services \ settings \ sgdisk \ diff --git a/target/product/embedded.mk b/target/product/embedded.mk index c40de4f..25a8975 100644 --- a/target/product/embedded.mk +++ b/target/product/embedded.mk @@ -89,6 +89,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ PRODUCT_COPY_FILES += \ system/core/rootdir/init.usb.rc:root/init.usb.rc \ + system/core/rootdir/init.usb.configfs.rc:root/init.usb.configfs.rc \ system/core/rootdir/init.trace.rc:root/init.trace.rc \ system/core/rootdir/ueventd.rc:root/ueventd.rc \ system/core/rootdir/etc/hosts:system/etc/hosts diff --git a/target/product/emulator.mk b/target/product/emulator.mk index 982f7da..7394d4f 100644 --- a/target/product/emulator.mk +++ b/target/product/emulator.mk @@ -50,6 +50,7 @@ PRODUCT_PACKAGES += \ sensors.ranchu PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml \ device/generic/goldfish/fstab.goldfish:root/fstab.goldfish \ device/generic/goldfish/init.goldfish.rc:root/init.goldfish.rc \ device/generic/goldfish/init.goldfish.sh:system/etc/init.goldfish.sh \ diff --git a/target/product/full_base.mk b/target/product/full_base.mk index fc6fd5c..bac3e03 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -26,9 +26,6 @@ PRODUCT_PACKAGES := \ # Put en_US first in the list, so make it default. PRODUCT_LOCALES := en_US -# Include drawables for all densities -PRODUCT_AAPT_CONFIG := normal - # Get some sounds $(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk) diff --git a/target/product/vboot.mk b/target/product/vboot.mk index e4b1144..48a4883 100644 --- a/target/product/vboot.mk +++ b/target/product/vboot.mk @@ -22,3 +22,4 @@ PRODUCT_SUPPORTS_VBOOT := true # We expect this file to exist with the suffixes ".vbprivk" and ".vbpupk". # TODO: find a proper location for this PRODUCT_VBOOT_SIGNING_KEY := external/vboot_reference/tests/devkeys/kernel_data_key +PRODUCT_VBOOT_SIGNING_SUBKEY := external/vboot_reference/tests/devkeys/kernel_subkey |