diff options
| -rw-r--r-- | Android.mk | 8 | ||||
| -rw-r--r-- | tests/Android.mk | 2 | ||||
| -rw-r--r-- | tests_camera/Android.mk | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 438866634..73c216ce6 100644 --- a/Android.mk +++ b/Android.mk @@ -14,7 +14,13 @@ LOCAL_RENDERSCRIPT_TARGET_API := 18 LOCAL_RENDERSCRIPT_COMPATIBILITY := 18 LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript -LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src) +# Keep track of previously compiled RS files too (from bundled GalleryGoogle). +prev_compiled_rs_files := $(call all-renderscript-files-under, src) + +# We already have these files from GalleryGoogle, so don't install them. +LOCAL_RENDERSCRIPT_SKIP_INSTALL := $(prev_compiled_rs_files) + +LOCAL_SRC_FILES := $(call all-java-files-under, src) $(prev_compiled_rs_files) LOCAL_SRC_FILES += $(call all-java-files-under, src_pd) LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res diff --git a/tests/Android.mk b/tests/Android.mk index 22bb7ee68..0cc5f877e 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -6,6 +6,8 @@ LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := 16 +LOCAL_STATIC_JAVA_LIBRARIES := littlemock dexmaker + # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/tests_camera/Android.mk b/tests_camera/Android.mk index 93fce12d6..f39533a71 100644 --- a/tests_camera/Android.mk +++ b/tests_camera/Android.mk @@ -4,9 +4,7 @@ include $(CLEAR_VARS) # We only want this apk build for tests. LOCAL_MODULE_TAGS := tests -LOCAL_JAVA_LIBRARIES := android.test.runner - -LOCAL_STATIC_JAVA_LIBRARIES := littlemock dexmaker +LOCAL_SDK_VERSION := 16 # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) |