commit 53d66b59038914e954d474576d924bd027357a15
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 22 01:19:52 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 22 01:19:53 2017 +0000
tree 2a828aa3a14db9be4ecbaef85155c65b1a92a396
parent 946af3fa5de1ed3c9d9465d6116e4ee21609b2a7
parent 9efe51f27a66aa0597096bff298611d9b0da0331

Merge "Use new naming scheme for TARGET_PLATFORM_VERSION"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index ab88b90..5b31e73 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2161,7 +2161,7 @@
 	@# Zip everything up, preserving symlinks and placing META/ files first to
 	@# help early validation of the .zip file while uploading it.
 	$(hide) find $(zip_root)/META | sort >$@.list
-	$(hide) find $(zip_root) | grep -v "^$(zip_root)/META/" | sort >>$@.list
+	$(hide) find $(zip_root) -path $(zip_root)/META -prune -o -print | sort >>$@.list
 	$(hide) $(SOONG_ZIP) -d -o $@ -C $(zip_root) -l $@.list
 
 .PHONY: target-files-package

target/product/embedded.mk

diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index c77bce2..681b2c4 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -20,7 +20,6 @@
 PRODUCT_PACKAGES += \
     adb \
     adbd \
-    android.hardware.configstore@1.0-impl \
     android.hardware.configstore@1.0-service \
     android.hidl.allocator@1.0-service \
     android.hidl.memory@1.0-impl \