Merge "Remove DBus support."
diff --git a/core/definitions.mk b/core/definitions.mk
index 2ec6e84..1a7cc50 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -3119,7 +3119,8 @@
NOTICE_FILE \
HOST_DALVIK_JAVA_LIBRARY \
HOST_DALVIK_STATIC_JAVA_LIBRARY \
- base_rules
+ base_rules \
+ HEADER_LIBRARY
$(foreach $(s),$(STATS.MODULE_TYPE),$(eval STATS.MODULE_TYPE.$(s) :=))
define record-module-type
diff --git a/core/setup_one_odex.mk b/core/setup_one_odex.mk
index 608ad11..dffa5c2 100644
--- a/core/setup_one_odex.mk
+++ b/core/setup_one_odex.mk
@@ -79,7 +79,11 @@
$(my_built_profile): $(PRIVATE_INSTALLED_MODULE)
$(my_built_profile):
cp $(PRIVATE_SOURCE_CLASSES) $(PRIVATE_PROFILE_CLASSES)
- $(PROFMAN) --create-profile-from=$(PRIVATE_PROFILE_CLASSES) --apk=$(PRIVATE_INSTALLED_MODULE) --dex-location=$(PRIVATE_DEX_LOCATION) --reference-profile-file=$@
+ ANDROID_LOG_TAGS="*:e" $(PROFMAN) \
+ --create-profile-from=$(PRIVATE_PROFILE_CLASSES) \
+ --apk=$(PRIVATE_INSTALLED_MODULE) \
+ --dex-location=$(PRIVATE_DEX_LOCATION) \
+ --reference-profile-file=$@
endif
$(eval $(call copy-one-file,$(my_built_odex),$(my_installed_odex)))
diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index 8b40fe0..e26c628 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -84,7 +84,6 @@
# SELinux packages
PRODUCT_PACKAGES += \
- secilc \
file_contexts.bin \
nonplat_file_contexts \
nonplat_mac_permissions.xml \
@@ -96,8 +95,7 @@
plat_property_contexts \
plat_seapp_contexts \
plat_service_contexts \
- selinux_version \
- sepolicy
+ selinux_version
# AID Generation for
# <pwd.h> and <grp.h>