DO NOT MERGE: Revert "DO NOT MERGE: Remove AppSearch from Android R."
This reverts commit c9c7116721b38d3389d654a2f73d116882f7323a.
This revert is to avoid merge conflict when ag/11299431 is auto-merged
to master.
This change will again be reverted when ag/11299431 lands.
Bug: 150999716
Test: m
Change-Id: Ia0f7a0e0eb8cf6f6f4d0693de01777a8a750c769
diff --git a/apex/apex.go b/apex/apex.go
index dbbfe78..71fa636 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -92,6 +92,13 @@
//
// Module separator
//
+ m["com.android.appsearch"] = []string{
+ "icing-java-proto-lite",
+ "libprotobuf-java-lite",
+ }
+ //
+ // Module separator
+ //
artApexContents := []string{
"art_cmdlineparser_headers",
"art_disassembler_headers",