Merge "Add -lm to the default libs for Linux & Darwin"
diff --git a/core/binary.mk b/core/binary.mk
index 2c715ea..45c2477 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -1717,17 +1717,19 @@
my_ldflags := $(filter-out -l%,$(my_ldlib_flags))
# One last verification check for ldlibs
-ifndef LOCAL_IS_HOST_MODULE
my_allowed_ldlibs :=
-ifneq ($(LOCAL_SDK_VERSION),)
- my_allowed_ldlibs := $(addprefix -l,$(NDK_PREBUILT_SHARED_LIBRARIES))
+ifndef LOCAL_IS_HOST_MODULE
+ ifneq ($(LOCAL_SDK_VERSION),)
+ my_allowed_ldlibs := $(addprefix -l,$(NDK_PREBUILT_SHARED_LIBRARIES))
+ endif
+else
+ my_allowed_ldlibs := $($(my_prefix)AVAILABLE_LIBRARIES)
endif
my_bad_ldlibs := $(filter-out $(my_allowed_ldlibs),$(my_ldlibs))
ifneq ($(my_bad_ldlibs),)
$(error $(LOCAL_MODULE_MAKEFILE): $(LOCAL_MODULE): Bad LOCAL_LDLIBS entries: $(my_bad_ldlibs))
endif
-endif
# my_cxx_ldlibs may contain linker flags need to wrap certain libraries
# (start-group/end-group), so append after the check above.
diff --git a/core/combo/javac.mk b/core/combo/javac.mk
index b09b10c..cb034e9 100644
--- a/core/combo/javac.mk
+++ b/core/combo/javac.mk
@@ -13,12 +13,7 @@
ifdef PRODUCT_COMPILE_WITH_JACK
ANDROID_COMPILE_WITH_JACK := $(PRODUCT_COMPILE_WITH_JACK)
else
- # TODO(b/62038127): remove TARGET_BUILD_APPS check
- ifdef TARGET_BUILD_APPS
- ANDROID_COMPILE_WITH_JACK := true
- else
- ANDROID_COMPILE_WITH_JACK := false
- endif
+ ANDROID_COMPILE_WITH_JACK := false
endif
endif