Add extraction of necessary libs from the statsd APEX in Golem builds.
Test: m TARGET_PRODUCT=silvermont build-art-target-golem
env LD_LIBRARY_PATH=out/target/product/silvermont/system/lib \
ldd out/target/product/silvermont/system/bin/dex2oat32
Check that libstatssocket.so is found
Bug: 178500083
Change-Id: I98593fcd0b094bfdd65aa169022eaacbca683475
diff --git a/Android.mk b/Android.mk
index 451901c..8d20843 100644
--- a/Android.mk
+++ b/Android.mk
@@ -593,6 +593,10 @@
lib64/libicu_jni.so \
lib64/libicuuc.so \
+PRIVATE_STATSD_APEX_DEPENDENCY_LIBS := \
+ lib/libstatssocket.so \
+ lib64/libstatssocket.so \
+
# Extracts files from an APEX into a location. The APEX can be either a .apex
# file in $(TARGET_OUT)/apex, or a directory in the same location. Files are
# extracted to $(TARGET_OUT) with the same relative paths as under the APEX
@@ -640,6 +644,7 @@
$(RUNTIME_APEX) \
$(CONSCRYPT_APEX) \
$(I18N_APEX) \
+ $(STATSD_APEX) \
$(TZDATA_APEX)
$(call extract-from-apex,$(RELEASE_ART_APEX),\
$(PRIVATE_ART_APEX_DEPENDENCY_LIBS) $(PRIVATE_ART_APEX_DEPENDENCY_FILES))
@@ -662,6 +667,8 @@
$(PRIVATE_CONSCRYPT_APEX_DEPENDENCY_LIBS))
$(call extract-from-apex,$(I18N_APEX),\
$(PRIVATE_I18N_APEX_DEPENDENCY_LIBS))
+ $(call extract-from-apex,$(STATSD_APEX),\
+ $(PRIVATE_STATSD_APEX_DEPENDENCY_LIBS))
$(call extract-from-apex,$(TZDATA_APEX),)
########################################################################
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index 9e8c4b9..d485518 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -139,13 +139,10 @@
# Testing ART APEX, used in ART device testing.
TESTING_ART_APEX := com.android.art.testing
-# Runtime (Bionic) APEX
RUNTIME_APEX := com.android.runtime
-# Conscrypt APEX
CONSCRYPT_APEX := com.android.conscrypt
-# i18n APEX
I18N_APEX := com.android.i18n
-# Tzdata APEX
+STATSD_APEX := com.android.os.statsd
TZDATA_APEX := com.android.tzdata
# A phony file to create the ICU data file for host.