aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2018-02-07 01:30:36 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-02-07 01:30:36 +0000
commit6668c743790380cb3e7889c2abb6cd53b720a211 (patch)
treea9679bb1aa57d85805495596c6b4b182ba568214
parent086d9d51dc7c71ce8713f95e27efe53cb3363a8e (diff)
parent16600a01e44eafc41bd079268af38d3f458b7813 (diff)
downloadhamcrest-pie-b4s4-release.tar.gz
Merge "Build hamcrest with core_current" am: 8ac829b3c6 am: 3f279fec9candroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-n-iot-release-ihome-igv1android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devoreo-mr1-1.2-iot-releasenougat-iot-releasemaster-cuttlefish-testing-release
am: 16600a01e4 Change-Id: Id699a60afe02f05eb6732de7529d18517c2e86f8
-rw-r--r--hamcrest-core/Android.bp2
-rw-r--r--hamcrest-library/Android.bp2
2 files changed, 2 insertions, 2 deletions
diff --git a/hamcrest-core/Android.bp b/hamcrest-core/Android.bp
index 711ebfe..da980d8 100644
--- a/hamcrest-core/Android.bp
+++ b/hamcrest-core/Android.bp
@@ -19,5 +19,5 @@ java_library_static {
host_supported: true,
hostdex: true,
srcs: ["src/main/java/**/*.java"],
- sdk_version: "25",
+ sdk_version: "core_current",
}
diff --git a/hamcrest-library/Android.bp b/hamcrest-library/Android.bp
index c91c7c6..b91fb99 100644
--- a/hamcrest-library/Android.bp
+++ b/hamcrest-library/Android.bp
@@ -20,5 +20,5 @@ java_library_static {
srcs: ["src/main/java/**/*.java"],
libs: ["hamcrest"],
- sdk_version: "8",
+ sdk_version: "core_current",
}