diff options
| author | Xin Li <delphij@google.com> | 2018-08-06 16:50:47 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-08-06 16:50:47 -0700 |
| commit | c1f52d7866829b6d9b36a1a26f7cc9b0a0482cc4 (patch) | |
| tree | 27ef4a3c6afc7a1dbcfc3f071afa84573883ed43 | |
| parent | fedf8f2d8099bf7bb85dc3db8699343d56617deb (diff) | |
| parent | 56f6d266beb3525111a44e18d06d6d96148b3480 (diff) | |
| download | zxing-c1f52d7866829b6d9b36a1a26f7cc9b0a0482cc4.tar.gz | |
Merge Android Pie into master
Bug: 112104996
Change-Id: I892e3b59e18a7ccdaa96d47f4180db8355a89d1f
| -rw-r--r-- | core/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/Android.mk b/core/Android.mk index b4027ede8..8eb6e0c20 100644 --- a/core/Android.mk +++ b/core/Android.mk @@ -2,3 +2,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := zxing-core-1.7:core.jar include $(BUILD_MULTI_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := zxing-core-1.7:core.jar +include $(BUILD_HOST_PREBUILT) |