Refine abcc for system image.
After apply this patch:
1. Use build-abcc.sh with --only-assets to generate toolchain assets.
3. mmm ndk/tests/abcc
4. make systemimage
Also 2 modifications.
1. Change name abcc-$abi.apk to abcc-$abi-unsigned.apk for clearity.
2. Add prebuilts dir into .gitignore.
Change-Id: Iadace270113209e958439250e6db75c9ed6ea0b8
diff --git a/.gitignore b/.gitignore
index d952baf..ed6ae76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/ndk-stack*
/ndk-depends*
prebuilt/
+tests/abcc/prebuilts/
diff --git a/tests/abcc/Android.mk b/tests/abcc/Android.mk
index 835bfa4..2a7590e 100644
--- a/tests/abcc/Android.mk
+++ b/tests/abcc/Android.mk
@@ -3,23 +3,16 @@
include $(CLEAR_VARS)
-ifeq ($(OUT_DIR),)
-$(error No OUT_DIR defined. Not lunch yet?)
-endif
-
-COMPILER_APP_DIR := $(realpath $(OUT_DIR))/obj/APPS/AndroidBitcodeCompiler_intermediates
-
#######################################################
include $(CLEAR_VARS)
-LOCAL_ASSET_DIR := $(COMPILER_APP_DIR)/assets # We define this rule in jni/Android.mk
+LOCAL_ASSET_DIR := $(realpath $(LOCAL_PATH))/prebuilts/assets/$(TARGET_CPU_ABI)
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := AndroidBitcodeCompiler
LOCAL_MODULE_TAGS := optional
LOCAL_CERTIFICATE := platform
LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_ADDITIONAL_DEPENDENCIES := libjni_abcc # Invoke building compiler app assets
LOCAL_NO_CHECK_ASSETS := true
include $(BUILD_PACKAGE)
diff --git a/tests/abcc/build-abcc.sh b/tests/abcc/build-abcc.sh
index 082316f..178a5e0 100755
--- a/tests/abcc/build-abcc.sh
+++ b/tests/abcc/build-abcc.sh
@@ -148,7 +148,7 @@
else # DEBUG != yes
run ant release -Dasset.dir=prebuilts/assets/$ABI
fail_panic "Build dex failed. Abort."
- run cp -a bin/$ABCC-release-unsigned.apk $OUT_DIR/$ABCC-$ABI.apk
+ run cp -a bin/$ABCC-release-unsigned.apk $OUT_DIR/$ABCC-$ABI-unsigned.apk
fi
done
diff --git a/tests/abcc/jni/Android.mk b/tests/abcc/jni/Android.mk
index 0e0a66a..51fd885 100644
--- a/tests/abcc/jni/Android.mk
+++ b/tests/abcc/jni/Android.mk
@@ -28,36 +28,13 @@
# Check in AOSP or NDK usage
ifeq ($(SYSTEM_PREBUILT_PACKAGE),true)
-ifeq ($(OUT_DIR),)
-$(error No OUT_DIR defined. Not lunch yet?)
-endif
-
-COMPILER_APP_DIR := $(realpath $(OUT_DIR))/obj/APPS/AndroidBitcodeCompiler_intermediates
-
LOCAL_SHARED_LIBRARIES := liblog libstlport
include external/stlport/libstlport.mk
-#######################################################
-# We put this here since LOCAL_GENERATED_SOURCES only been used by binary.mk
-
-TOOLCHAIN_ASSETS := $(COMPILER_APP_DIR)/assets
-
-ifndef NDK_TARGET_SYSROOT
-NDK_TARGET_SYSROOT := $(LOCAL_PATH)/../prebuilts/assets
-endif
-
-GEN := $(call local-intermediates-dir)/phony_file # Must under local intermediate dir
-$(GEN):
- $(hide) rm -rf $(TOOLCHAIN_ASSETS)
- $(hide) mkdir -p $(TOOLCHAIN_ASSETS)
- $(hide) cp -a $(NDK_TARGET_SYSROOT)/$(TARGET_CPU_ABI)/* $(TOOLCHAIN_ASSETS)
-
-LOCAL_GENERATED_SOURCES := $(GEN)
-
-########################################################
-
else # SYSTEM_PREBUILT_PACKAGE
+
LOCAL_LDLIBS := -llog
+
endif
include $(BUILD_SHARED_LIBRARY)
