Fix LibNoManifest targets

Apparently, android_library exports AndroidManifest.xml by default,
even if we don't specify the "manifest" field.

Created a LibNoManifest_AndroidManifest.xml file, and let LibNoManifest
targets to depend on it.

Test: 1. Make sure TCS in GoogleExtServices is still enabled.
2. Make sure copy code action is still working.
3. Settings -> Adaptive notification
   ExtServices is no longer shown with the icon used in our library....

Bug: 135110855

Change-Id: I4b4b42612c0d70ba05d83197dd0a927b99c3e57c

3 files changed, 56 insertions, 1 deletions

diff --git a/notification/Android.bp b/notification/Android.bp
index b201f56..966941d 100644
--- a/notification/Android.bp
+++ b/notification/Android.bp
@@ -33,4 +33,5 @@ android_library {
     ],
     sdk_version: "system_current",
     min_sdk_version: "29",
+    manifest: "LibNoManifest_AndroidManifest.xml",
 }
diff --git a/notification/AndroidManifest.xml b/notification/AndroidManifest.xml
index 790db48..d8ac0fe 100644
--- a/notification/AndroidManifest.xml
+++ b/notification/AndroidManifest.xml
@@ -1,3 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<!--
+  This manifest file is for used for testing.
+  This library is typically shipped as part of ExtServices and is configured in ExtServices's
+  manifest.
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.textclassifier.notification">
 
@@ -12,4 +36,4 @@
         android:theme="@android:style/Theme.NoDisplay" />
   </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/notification/LibNoManifest_AndroidManifest.xml b/notification/LibNoManifest_AndroidManifest.xml
new file mode 100644
index 0000000..b9ebf7d
--- /dev/null
+++ b/notification/LibNoManifest_AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<!--
+  This is for the AndroidManifest.xml for the TextClassifierNotificationLibNoManifest library.
+  The user of this library should explicitly put the necssary components in their own
+  AndroidManifest.xml, see AndroidManifest.xml under the same folder.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.textclassifier.notification">
+
+    <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29"/>
+
+</manifest>