diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-14 12:48:58 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-14 12:48:58 +0000 |
| commit | d1b217fc31026e8cef49907f4160b78182f328cb (patch) | |
| tree | b1f07f3ec97ea3efe4ea90f7130f18f3b56267e8 | |
| parent | 51af59898aba03ac1781655f953aee43965f30d8 (diff) | |
| parent | 930be6788b026666cb047f69d17343a5df145c53 (diff) | |
| download | icing-d1b217fc31026e8cef49907f4160b78182f328cb.tar.gz | |
Snap for 9941464 from 930be6788b026666cb047f69d17343a5df145c53 to androidx-window-release
Change-Id: Ib81252e993cdb50887af2dcddbe0f1444f7e4714
| -rw-r--r-- | OWNERS | 1 | ||||
| -rw-r--r-- | build.gradle | 20 |
2 files changed, 14 insertions, 7 deletions
@@ -1,3 +1,2 @@ adorokhine@google.com tjbarron@google.com -dsaadati@google.com diff --git a/build.gradle b/build.gradle index 2ac1d39..0082881 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ * limitations under the License. */ -import static androidx.build.SupportConfig.* +import androidx.build.SupportConfig buildscript { dependencies { @@ -28,12 +28,12 @@ plugins { } android { - buildToolsVersion BUILD_TOOLS_VERSION - compileSdkVersion COMPILE_SDK_VERSION + buildToolsVersion SupportConfig.buildToolsVersion(project) + compileSdkVersion SupportConfig.COMPILE_SDK_VERSION defaultConfig { - minSdkVersion DEFAULT_MIN_SDK_VERSION - targetSdkVersion TARGET_SDK_VERSION - testInstrumentationRunner INSTRUMENTATION_RUNNER + minSdkVersion SupportConfig.DEFAULT_MIN_SDK_VERSION + targetSdkVersion SupportConfig.TARGET_SDK_VERSION + testInstrumentationRunner SupportConfig.INSTRUMENTATION_RUNNER } compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 @@ -51,6 +51,13 @@ android { namespace "com.google.android.icing" } +// This project has no device tests, skip building it +androidComponents { + beforeVariants(selector().withName("debug"), { variantBuilder -> + variantBuilder.enableAndroidTest = false + }) +} + dependencies { api('androidx.annotation:annotation:1.1.0') @@ -59,6 +66,7 @@ dependencies { androidTestImplementation(libs.testCore) androidTestImplementation(libs.testRules) androidTestImplementation(libs.truth) + androidTestImplementation(libs.kotlinBom) } protobuf { |