From 36e792b89457b7bca3a490a7e0444b1be271ef6c Mon Sep 17 00:00:00 2001 From: Paul Crowley Date: Thu, 4 Jun 2015 09:59:33 +0100 Subject: Build "secdiscard" for securely discarding data from flash devices. Bug: 19706593 Change-Id: I073b7b39f25b054abdf2b983a63d029d690970a9 (cherry picked from commit 54a28654e605c73d42c66a552b8fc9c6255529cf) --- target/product/base.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'target') diff --git a/target/product/base.mk b/target/product/base.mk index 3656d78..6a74c00 100644 --- a/target/product/base.mk +++ b/target/product/base.mk @@ -110,6 +110,7 @@ PRODUCT_PACKAGES += \ run-as \ schedtest \ sdcard \ + secdiscard \ services \ settings \ sgdisk \ -- cgit v1.1 From e8c212235fc4a83a20cb9bd25f17897a75b15440 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Fri, 7 Aug 2015 11:58:05 -0700 Subject: vboot_signer: Add kernel subkey required for signing kernel keyblock Currently, the keyblock was being generated using data_key.vbprivk. However, we need to use kernel_subkey.vbprivk for kernel keyblock generation. This did not create any issues until now because dev-mode just throws a message saying that keyblock is invalid. But, normal-mode does not boot if keyblock is invalid. Add extra parameter for passing in kernel subkey to vboot_signer script. TEST="make bootimage-nodeps" generates correctly signed boot.img. Verified that the image boots fine in normal mode. Change-Id: I0fc2183b466e34ddf1d98c9532072548504fcec4 Signed-off-by: Furquan Shaikh --- target/product/vboot.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'target') 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 -- cgit v1.1 From a8a4a93733e7d13c9c2f555a0b19a8564420aa18 Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan Date: Fri, 28 Aug 2015 19:44:05 -0700 Subject: Include init.usb.configfs.rc into rootdir Bug=23633457 Change-Id: I26bbc5ff597138b2ccac1de72117753739b31554 --- target/product/embedded.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'target') 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 -- cgit v1.1 From 9ee993f60ef25149a239e1e1910b6c8d02f3484d Mon Sep 17 00:00:00 2001 From: bohu Date: Mon, 14 Sep 2015 16:02:43 -0700 Subject: emulator.mk: Add ethernet permission Networking on old emulator device(a.k.a. goldfish) relies on RIL; However, RIL is not available on ranchu device yet. For ranchu device to have a functional networking, we need to add ethernet permission and start dhcpcd_eth0 service on ranchu device. This CL adds ethernet permission to both goldfish (which is harmless) and ranchu devices. This addition was originally proposed by miroslav.tisma@imgtec.com and the ethernet permission was only added to arm64 and mips64 after discussion. With the ranchu device supporting more architectures, it makes sense to allow this permission on all devices and all CPU architectures. related CL by miroslav.tisma@imgtec.com on AOSP: b09fb84becf73bf2bc578ebf27910d75b79d668a bug: 24070972 Change-Id: I81ac5d8901adee43784fe9dd45a170fb90bb824a --- target/product/emulator.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'target') 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 \ -- cgit v1.1 From 393c62549a6340b3473f14b71d583e118d7e6a6d Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Fri, 12 Jun 2015 10:33:59 -0700 Subject: Really include drawables for all densities. Previously with "PRODUCT_AAPT_CONFIG := normal" resource with modifier "small" isn't included. Bug: 21643610 Change-Id: I53940d716fb9705462b1abb882e04103e211f8af --- target/product/full_base.mk | 3 --- 1 file changed, 3 deletions(-) (limited to 'target') diff --git a/target/product/full_base.mk b/target/product/full_base.mk index 3b547c8..65bdf0f 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -45,9 +45,6 @@ PRODUCT_PROPERTY_OVERRIDES := \ # 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) -- cgit v1.1