commit 076b9057634a503c38d53a45b6ad97cc0c304671
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 13 23:35:41 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 13 23:35:41 2018 +0000
tree 17358d370e20456d606837da386a4989dacf20a0
parent 44199a57da6ae5eb2f0c72a211d10a0d77c97752
parent 5568c19ae107ac4bc68cb75bca6bc5f2ecf35003

Merge "aidegen: add extra info to collect in module-info."

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 440c32d..a594149 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -1360,7 +1360,7 @@
         my_warn_types :=
         my_allowed_types := native:vendor native:vndk
     endif
-else ifneq ($(filter $(TARGET_RECOVERY_OUT)/%,$(LOCAL_MODULE_PATH)),)
+else ifneq ($(filter $(TARGET_RECOVERY_OUT)/%,$(call get_non_asan_path,$(LOCAL_MODULE_PATH))),)
 my_link_type := native:recovery
 my_warn_types :=
 # TODO(b/113303515) remove native:platform and my_allowed_ndk_types

core/envsetup.mk

diff --git a/core/envsetup.mk b/core/envsetup.mk
index 4396dd2..8ffbc19 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -986,11 +986,11 @@
 
 TARGET_OUT_PRODUCT_SERVICES := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_PRODUCT_SERVICES)
 ifneq ($(filter address,$(SANITIZE_TARGET)),)
-target_out_product_services_shared_libraries_base := $(PRODUCT_SERVICES_OUT)/$(TARGET_COPY_OUT_ASAN)/product_services
+target_out_product_services_shared_libraries_base := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_ASAN)/product_services
 ifeq ($(SANITIZE_LITE),true)
 # When using SANITIZE_LITE, APKs must not be packaged with sanitized libraries, as they will not
 # work with unsanitized app_process. For simplicity, generate APKs into /data/asan/.
-target_out_product_services_app_base := $(PRODUCT_SERVICES_OUT)/$(TARGET_COPY_OUT_ASAN)/product_services
+target_out_product_services_app_base := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_ASAN)/product_services
 else
 target_out_product_services_app_base := $(TARGET_OUT_PRODUCT_SERVICES)
 endif

core/pdk_config.mk

diff --git a/core/pdk_config.mk b/core/pdk_config.mk
index 4c582e3..b3cbb9c 100644
--- a/core/pdk_config.mk
+++ b/core/pdk_config.mk
@@ -13,8 +13,6 @@
 # all paths under out dir
 PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR += \
   target/common/obj/JAVA_LIBRARIES/android.test.runner_intermediates \
-  target/common/obj/JAVA_LIBRARIES/android.hidl.base-V1.0-java_intermediates \
-  target/common/obj/JAVA_LIBRARIES/android.hidl.manager-V1.0-java_intermediates \
   target/common/obj/JAVA_LIBRARIES/android-common_intermediates \
   target/common/obj/JAVA_LIBRARIES/android-ex-camera2_intermediates \
   target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates \

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index bcbb951..6cc6561 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -270,9 +270,7 @@
     framework \
     telephony-common \
     voip-common \
-    ims-common \
-    android.hidl.base-V1.0-java \
-    android.hidl.manager-V1.0-java
+    ims-common
 
 # Add the compatibility library that is needed when org.apache.http.legacy
 # is removed from the bootclasspath.

tools/signapk/Android.bp

diff --git a/tools/signapk/Android.bp b/tools/signapk/Android.bp
index ee4cfab..e95205d 100644
--- a/tools/signapk/Android.bp
+++ b/tools/signapk/Android.bp
@@ -24,7 +24,7 @@
         "apksig",
         "bouncycastle-unbundled",
         "bouncycastle-bcpkix-unbundled",
-        "conscrypt",
+        "conscrypt-nojarjar",
     ],
 
     required: ["libconscrypt_openjdk_jni"],