Unjarjar external icing.
Change-Id: If608c50c7b08ec560b5ea93025bf24ebc31b1f88
Bug: 146029401
Test: atest core/tests/coretests/src/android/app/appsearch/AppSearchDocumentTest.java
diff --git a/Android.bp b/Android.bp
index 7982c4f..265e62e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,14 +15,11 @@
java_library {
name: "icing-java-proto-lite",
proto: {
- // If you change the proto type, also update jarjar-rules.txt to match
- // the corresponding proto lib's package path.
type: "lite",
include_dirs: ["external/protobuf/src"],
canonical_path_from_root: false,
},
srcs: ["icing/proto/*.proto"],
- jarjar_rules: "jarjar-rules.txt",
sdk_version: "core_current",
}
diff --git a/jarjar-rules.txt b/jarjar-rules.txt
deleted file mode 100644
index 0f4292e..0000000
--- a/jarjar-rules.txt
+++ /dev/null
@@ -1 +0,0 @@
-rule com.google.protobuf.** com.google.android.icing.protobuf.@1
diff --git a/java/src/com/google/android/icing/IcingSearchEngine.java b/java/src/com/google/android/icing/IcingSearchEngine.java
index 03a4fbe..a12352b 100644
--- a/java/src/com/google/android/icing/IcingSearchEngine.java
+++ b/java/src/com/google/android/icing/IcingSearchEngine.java
@@ -38,7 +38,7 @@
import com.google.android.icing.proto.SearchSpecProto;
import com.google.android.icing.proto.SetSchemaResultProto;
import com.google.android.icing.proto.StatusProto;
-import com.google.android.icing.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.InvalidProtocolBufferException;
/** Java wrapper to access native APIs in external/icing/icing/icing-search-engine.h */
public final class IcingSearchEngine {
