diff options
| author | Ying Wang <wangying@google.com> | 2014-06-25 18:52:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-25 18:52:02 +0000 |
| commit | 58f8cf727311b91a5bae272201f6d07c832af392 (patch) | |
| tree | 519e2db7829c8d0c951992be22026d53d149afd9 /core/clear_vars.mk | |
| parent | 3ee67afe40a1faf86ac60db3d83f23c21f073e18 (diff) | |
| parent | 904446ce0b3f430ac88ae0c08b9c613721474cd5 (diff) | |
| download | build-58f8cf727311b91a5bae272201f6d07c832af392.zip build-58f8cf727311b91a5bae272201f6d07c832af392.tar.gz build-58f8cf727311b91a5bae272201f6d07c832af392.tar.bz2 | |
am 904446ce: am 1a3d260f: am e69d4350: Merge "Support to add JNI of both archs in multilib build."
* commit '904446ce0b3f430ac88ae0c08b9c613721474cd5':
Support to add JNI of both archs in multilib build.
Diffstat (limited to 'core/clear_vars.mk')
| -rw-r--r-- | core/clear_vars.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 69b9e6c..dc2362d 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -172,6 +172,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES_$(TARGET_ARCH):= LOCAL_GENERATED_SOURCES_$(TARGET_ARCH):= LOCAL_REQUIRED_MODULES_$(TARGET_ARCH):= LOCAL_CLANG_$(TARGET_ARCH):= +LOCAL_PREBUILT_JNI_LIBS_$(TARGET_ARCH):= ifdef TARGET_2ND_ARCH LOCAL_SRC_FILES_$(TARGET_2ND_ARCH):= LOCAL_CFLAGS_$(TARGET_2ND_ARCH):= @@ -186,6 +187,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES_$(TARGET_2ND_ARCH):= LOCAL_GENERATED_SOURCES_$(TARGET_2ND_ARCH):= LOCAL_REQUIRED_MODULES_$(TARGET_2ND_ARCH):= LOCAL_CLANG_$(TARGET_2ND_ARCH):= +LOCAL_PREBUILT_JNI_LIBS_$(TARGET_2ND_ARCH):= endif LOCAL_SRC_FILES_$(HOST_ARCH):= LOCAL_CFLAGS_$(HOST_ARCH):= |