diff options
| author | Po-Chien Hsueh <pchsueh@google.com> | 2019-08-19 18:05:32 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-19 18:05:32 -0700 |
| commit | a3d506370f345b82d565894e2ad89f2d88873a57 (patch) | |
| tree | f2c8dedcc2d474646878fb7c4e41edb24a92d496 | |
| parent | 78800cfbd785db87f044f1d3b6615427ef2550fd (diff) | |
| parent | 2b265cdbaf71fb5754c40bdb6548440cfeb7aefe (diff) | |
| download | ex-a3d506370f345b82d565894e2ad89f2d88873a57.tar.gz | |
Merge "Move libframesequence.so to /product" am: 56ce9c6bf3 am: 806f2998d4
am: 2b265cdbaf
Change-Id: I6f366e28e57a3bb02567055de9d86b5c07b41c88
| -rw-r--r-- | CleanSpec.mk | 3 | ||||
| -rw-r--r-- | framesequence/jni/Android.bp | 2 | ||||
| -rw-r--r-- | framesequence/samples/FrameSequenceSamples/Android.bp | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 70cc8332..b6754de6 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -49,3 +49,6 @@ # ************************************************ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android-ex-camera2-portability_intermediates/) +$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib/libframesequence.so) +$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib64/libframesequence.so) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/FrameSequenceSample) diff --git a/framesequence/jni/Android.bp b/framesequence/jni/Android.bp index 4e57548c..f2fd41b5 100644 --- a/framesequence/jni/Android.bp +++ b/framesequence/jni/Android.bp @@ -50,4 +50,6 @@ cc_library_shared { "libjnigraphics", "liblog", ], + + product_specific: true, } diff --git a/framesequence/samples/FrameSequenceSamples/Android.bp b/framesequence/samples/FrameSequenceSamples/Android.bp index 6df8d057..24458dfa 100644 --- a/framesequence/samples/FrameSequenceSamples/Android.bp +++ b/framesequence/samples/FrameSequenceSamples/Android.bp @@ -31,4 +31,5 @@ android_app { "com.android.framesequence.samples", ], + product_specific: true, } |