From 431bded8e1a0df936b17526a345d5688efad2009 Mon Sep 17 00:00:00 2001
From: Omar Ismail <omarismail@google.com>
Date: Thu, 18 Apr 2024 13:44:27 -0400
Subject: Repackage icing lib using AndroidXRepackagePlugin without protobuf
 runtime

BUG: 296864329

TESTED: Ran ./gradlew :appsearch:appsearch-local-storage:cC and it worked. Also published the appsearch-local-storage project, and when viewing the AAR, it contained the bundled icing lib, without the protobuf runtime
Change-Id: I59b78db63403ffe960f5df294e8646eae338b112
---
 build.gradle | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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 {
-- 
cgit v1.2.3