Merge "Revert "Apply hiddenapi build tool on boot jars""
diff --git a/core/Makefile b/core/Makefile
index 39969bc..fbd71b3 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2503,8 +2503,8 @@
$(HOST_OUT_EXECUTABLES)/imgdiff \
$(HOST_OUT_EXECUTABLES)/bsdiff \
$(BUILD_IMAGE_SRCS) \
- $(INSTALLED_VENDOR_MANIFEST) \
- $(INSTALLED_VENDOR_MATRIX) \
+ $(BUILT_VENDOR_MANIFEST) \
+ $(BUILT_VENDOR_MATRIX) \
| $(ACP)
@echo "Package target files: $@"
$(call create-system-vendor-symlink)
diff --git a/core/config.mk b/core/config.mk
index dea3f8f..37ab875 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -947,8 +947,8 @@
INTERNAL_PLATFORM_TEST_EXACT_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/test-exact.txt
INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-light-greylist.txt
-INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST := frameworks/base/config/hiddenapi-dark-greylist.txt
-INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST := frameworks/base/config/hiddenapi-blacklist.txt
+INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-dark-greylist.txt
+INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-blacklist.txt
# This is the standard way to name a directory containing prebuilt target
# objects. E.g., prebuilt/$(TARGET_PREBUILT_TAG)/libc.so
diff --git a/core/static_java_library.mk b/core/static_java_library.mk
index 8348349..aa1f0fa 100644
--- a/core/static_java_library.mk
+++ b/core/static_java_library.mk
@@ -88,7 +88,7 @@
LOCAL_INTERMEDIATE_TARGETS += $(my_res_package)
endif # LOCAL_USE_AAPT2
-endif # LOCAL_RESOURCE_DIR
+endif # need_compile_res
all_res_assets := $(all_resources)
diff --git a/target/product/base.mk b/target/product/base.mk
index c3eb3b2..750d3fa 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -114,6 +114,7 @@
mtpd \
ndc \
netd \
+ perfetto \
ping \
ping6 \
platform.xml \
@@ -132,6 +133,8 @@
svc \
tc \
telecom \
+ traced \
+ traced_probes \
vdc \
vold \
wm