diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-25 19:22:20 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-25 19:22:20 +0000 |
| commit | e091467953ace8d54fd3e06148fd827a3d780f97 (patch) | |
| tree | aaa7cb313ca956a5e7b01f65223311730f0c5388 | |
| parent | 1aa0cedd57e0c9e64f92b96e676551b8397305f2 (diff) | |
| parent | b1b8c8771490b286182357d1f2f8418a47e3297c (diff) | |
| download | icing-androidx-compose-compiler-release.tar.gz | |
Snap for 11766105 from b1b8c8771490b286182357d1f2f8418a47e3297c to androidx-compose-compiler-releaseandroidx-compose-compiler-release
Change-Id: I32703790f078c4ad716b26d8a8d894aaea63f6c1
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | build.gradle | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 48a63d4..4b7c752 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.10.2) +cmake_minimum_required(VERSION 3.22.1) project(icing) diff --git a/build.gradle b/build.gradle index d0d1a39..97cc5e1 100644 --- a/build.gradle +++ b/build.gradle @@ -18,10 +18,19 @@ import androidx.build.SdkHelperKt plugins { id("AndroidXPlugin") + id("AndroidXRepackagePlugin") id("java-library") id("com.google.protobuf") } +repackage { + // Must match what is in frameworks/support/appsearch/appsearch-external-protobuf/build.gradle + addRelocation { + sourcePackage = "com.google.protobuf" + targetPackage = "com.google.android.icing.protobuf" + } +} + sourceSets { main { java.srcDir 'java/src/' @@ -32,7 +41,7 @@ sourceSets { dependencies { compileOnly("androidx.annotation:annotation:1.1.0") compileOnly(SdkHelperKt.getSdkDependency(project)) - implementation(libs.protobufLite) + compileOnly(libs.protobufLite) } afterEvaluate { |