diff options
| author | Ying Wang <wangying@google.com> | 2014-04-21 13:45:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-21 13:45:33 +0000 |
| commit | 717884ea102e2ba7f4d35e25cc2486fd18e8a0d1 (patch) | |
| tree | 372ee151380fafaddd52948c7969c548ab4fea91 | |
| parent | 54e236f9b8d6ee8459c98497d81a4feb48f0e82d (diff) | |
| parent | 9df9ad7e29aecf88fdeb026bda07963ab6789396 (diff) | |
| download | frameworks_base-717884ea102e2ba7f4d35e25cc2486fd18e8a0d1.zip frameworks_base-717884ea102e2ba7f4d35e25cc2486fd18e8a0d1.tar.gz frameworks_base-717884ea102e2ba7f4d35e25cc2486fd18e8a0d1.tar.bz2 | |
am 9df9ad7e: am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."
* commit '9df9ad7e29aecf88fdeb026bda07963ab6789396':
Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
| -rw-r--r-- | packages/DefaultContainerService/Android.mk | 2 | ||||
| -rw-r--r-- | packages/services/PacProcessor/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/DefaultContainerService/Android.mk b/packages/DefaultContainerService/Android.mk index 9961168..0de2c1f 100644 --- a/packages/DefaultContainerService/Android.mk +++ b/packages/DefaultContainerService/Android.mk @@ -7,7 +7,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := DefaultContainerService -LOCAL_REQUIRED_MODULES := libdefcontainer_jni +LOCAL_JNI_SHARED_LIBRARIES := libdefcontainer_jni LOCAL_CERTIFICATE := platform diff --git a/packages/services/PacProcessor/Android.mk b/packages/services/PacProcessor/Android.mk index d9566d5..3c4e951 100644 --- a/packages/services/PacProcessor/Android.mk +++ b/packages/services/PacProcessor/Android.mk @@ -25,7 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := PacProcessor LOCAL_CERTIFICATE := platform -LOCAL_REQUIRED_MODULES := libjni_pacprocessor +LOCAL_JNI_SHARED_LIBRARIES := libjni_pacprocessor include $(BUILD_PACKAGE) |