commit 46ff7618b02f96ba5f3a3ff5961bd90e0585d2d4
author Colin Cross <ccross@android.com> Thu May 10 20:04:25 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 10 20:04:25 2018 +0000
tree 6e759dce096e62a8074bc1914082a57b1829deaa
parent 63097b276be0db7cbee9e16996cd0ceb71487643
parent 164a33f194ca6b89bec50404260637dab9a32074

Merge "Fix zipped resources"

core/host_executable_internal.mk

diff --git a/core/host_executable_internal.mk b/core/host_executable_internal.mk
index c4f9f66..e72c419 100644
--- a/core/host_executable_internal.mk
+++ b/core/host_executable_internal.mk
@@ -33,7 +33,7 @@
 
 my_libdir := $(notdir $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_SHARED_LIBRARIES))
 ifeq ($(LOCAL_MODULE_CLASS),NATIVE_TESTS)
-$(LOCAL_BUILT_MODULE): PRIVATE_RPATHS := ../../$(my_libdir)
+$(LOCAL_BUILT_MODULE): PRIVATE_RPATHS := ../../$(my_libdir) ../../../$(my_libdir)
 else
 $(LOCAL_BUILT_MODULE): PRIVATE_RPATHS := ../$(my_libdir) $(my_libdir)
 endif

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 7151901..ea3714a 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -102,7 +102,7 @@
 $(call add_json_list, CFIIncludePaths,                   $(CFI_INCLUDE_PATHS) $(PRODUCT_CFI_INCLUDE_PATHS))
 $(call add_json_list, IntegerOverflowExcludePaths,       $(INTEGER_OVERFLOW_EXCLUDE_PATHS) $(PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS))
 
-$(call add_json_bool, UseClangLld,                       $(call invert_bool,$(filter 0 false,$(USE_CLANG_LLD))))
+$(call add_json_bool, UseClangLld,                       $(filter 1 true,$(USE_CLANG_LLD)))
 $(call add_json_bool, ClangTidy,                         $(filter 1 true,$(WITH_TIDY)))
 $(call add_json_str,  TidyChecks,                        $(WITH_TIDY_CHECKS))
 

core/use_lld_setup.mk

diff --git a/core/use_lld_setup.mk b/core/use_lld_setup.mk
index 464726c..17a9e27 100644
--- a/core/use_lld_setup.mk
+++ b/core/use_lld_setup.mk
@@ -4,17 +4,12 @@
 ## Output variables: my_use_clang_lld
 #############################################################
 
-# Use LLD by default.
-# Do not use LLD if LOCAL_USE_CLANG_LLD is false or 0,
-# or if LOCAL_USE_CLANG_LLD is not set and USE_CLANG_LLD is 0 or false.
-my_use_clang_lld := true
-ifneq (,$(LOCAL_USE_CLANG_LLD))
-  ifneq (,$(filter 0 false,$(LOCAL_USE_CLANG_LLD)))
-    my_use_clang_lld := false
-  endif
-else
-  ifneq (,$(filter 0 false,$(USE_CLANG_LLD)))
-    my_use_clang_lld := false
+# Use LLD only if it's not disabled by LOCAL_USE_CLANG_LLD,
+# and enabled by LOCAL_USE_CLANG_LLD or USE_CLANG_LLD.
+my_use_clang_lld := false
+ifeq (,$(filter 0 false,$(LOCAL_USE_CLANG_LLD)))
+  ifneq (,$(filter 1 true,$(LOCAL_USE_CLANG_LLD) $(USE_CLANG_LLD)))
+    my_use_clang_lld := true
   endif
 endif
 

target/product/base.mk

diff --git a/target/product/base.mk b/target/product/base.mk
index 919c16d..d6507c6 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -153,6 +153,7 @@
 PRODUCT_PACKAGES_DEBUG := \
     iotop \
     logpersist.start \
+    micro_bench \
     perfprofd \
     sqlite3 \
     strace