summaryrefslogtreecommitdiff
path: root/toolchain/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'toolchain/Android.mk')
-rw-r--r--toolchain/Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/toolchain/Android.mk b/toolchain/Android.mk
index f8d7db2..8602138 100644
--- a/toolchain/Android.mk
+++ b/toolchain/Android.mk
@@ -19,6 +19,7 @@ $(compiler): $(LOCAL_PATH)/$(LOCAL_MODULE).in | $(3RD_PARTY_SYSTEM_DEPS)
-e 's:@CFLAGS@:$(foreach p,$(TARGET_C_INCLUDES) $(EXTERNAL_PACKAGES_INCLUDE),-isystem "$${ANDROID_BUILD_TOP}/$(p)"):' \
-e 's:@LDFLAGS@:-B"$(patsubst $(PRODUCT_OUT)/%,$${ANDROID_PRODUCT_OUT}/%,$(TARGET_OUT_INTERMEDIATE_LIBRARIES))":' \
-e 's:@ROOT_SUBDIR@:$(3RD_PARTY_ROOT_SUBDIR):g' \
+ -e 's:@LIBDIR@:$(3RD_PARTY_LIBDIR):g' \
$< > $@.tmp \
&& chmod a+rx $@.tmp && mv $@.tmp $@
@@ -44,6 +45,7 @@ $(compiler): $(LOCAL_PATH)/$(LOCAL_MODULE).in | $(3RD_PARTY_SYSTEM_DEPS)
-e 's:@CFLAGS@:$(foreach p,$(TARGET_C_INCLUDES),-isystem "$${ANDROID_BUILD_TOP}/$(p)"):' \
-e 's:@LDFLAGS@:-B"$(patsubst $(PRODUCT_OUT)/%,$${ANDROID_PRODUCT_OUT}/%,$(TARGET_OUT_INTERMEDIATE_LIBRARIES))":' \
-e 's:@ROOT_SUBDIR@:$(3RD_PARTY_ROOT_SUBDIR):g' \
+ -e 's:@LIBDIR@:$(3RD_PARTY_LIBDIR):g' \
$< > $@.tmp \
&& chmod a+rx $@.tmp && mv $@.tmp $@