commit a3ab4cc9c9c28067e5e010bc728ae330769d2cb3
author Jean-Luc Brouillet <jeanluc@google.com> Wed Jan 11 02:04:15 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 11 02:04:16 2017 +0000
tree 82b210db7ef01cdfd2b827d9a6b4891438eecf7a
parent 2ec742a956997309fd184168ef83a547382aee3a
parent eba449391ecc26ffdc250777a71e253d1038f44a

Merge "Move rs/scriptc to rs/script_api/include."

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 143f060..cbe9eed 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1722,8 +1722,11 @@
   $(HOST_OUT_JAVA_LIBRARIES)/dumpkey.jar \
   $(HOST_OUT_JAVA_LIBRARIES)/signapk.jar \
   $(HOST_OUT_JAVA_LIBRARIES)/BootSignature.jar \
-  $(MAKE_EXT4FS) \
-  $(MKEXTUSERIMG) \
+  $(HOST_OUT_EXECUTABLES)/make_ext4fs \
+  $(HOST_OUT_EXECUTABLES)/mkuserimg.sh \
+  $(HOST_OUT_EXECUTABLES)/mke2fs \
+  $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs.sh \
+  $(HOST_OUT_EXECUTABLES)/e2fsdroid \
   $(HOST_OUT_EXECUTABLES)/mksquashfsimage.sh \
   $(HOST_OUT_EXECUTABLES)/mksquashfs \
   $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh \

target/product/embedded.mk

diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index 2bec290..af6bb98 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -21,6 +21,7 @@
     adb \
     adbd \
     android.hidl.memory@1.0-service \
+    android.hidl.memory@1.0-impl \
     atrace \
     bootanimation \
     bootstat \
@@ -83,10 +84,11 @@
     file_contexts.bin \
     nonplat_file_contexts \
     nonplat_mac_permissions.xml \
+    nonplat_seapp_contexts \
     plat_file_contexts \
     plat_mac_permissions.xml \
+    plat_seapp_contexts \
     property_contexts \
-    seapp_contexts \
     selinux_version \
     sepolicy \
     service_contexts