From 8b39919030cabd08dcd734bd518d810f32e660b9 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Wed, 29 Apr 2020 22:34:13 +0900
Subject: [PATCH] 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
---
 apex/apex.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apex/apex.go b/apex/apex.go
index dbbfe78af..71fa636a9 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -92,6 +92,13 @@ func makeApexAvailableWhitelist() map[string][]string {
 	//
 	// Module separator
 	//
+	m["com.android.appsearch"] = []string{
+		"icing-java-proto-lite",
+		"libprotobuf-java-lite",
+	}
+	//
+	// Module separator
+	//
 	artApexContents := []string{
 		"art_cmdlineparser_headers",
 		"art_disassembler_headers",