diff options
| author | Xin Li <delphij@google.com> | 2018-08-07 16:51:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-07 16:51:27 +0000 |
| commit | a102b9de15a31ed74e14a04228ef006e529e54a4 (patch) | |
| tree | 27ef4a3c6afc7a1dbcfc3f071afa84573883ed43 | |
| parent | fedf8f2d8099bf7bb85dc3db8699343d56617deb (diff) | |
| parent | c1f52d7866829b6d9b36a1a26f7cc9b0a0482cc4 (diff) | |
| download | zxing-a102b9de15a31ed74e14a04228ef006e529e54a4.tar.gz | |
Merge "Merge Android Pie into master"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release
| -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) |