Merge "Media-compat: Set up client/service test modules" into oc-support-26.1-dev
am: 7b5dabeab8
Change-Id: Id529e848cccd00498081d39c1ee5302d0dd199ad
diff --git a/media-compat-test-client/AndroidManifest.xml b/media-compat-test-client/AndroidManifest.xml
new file mode 100644
index 0000000..290b67e
--- /dev/null
+++ b/media-compat-test-client/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2017 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.
+-->
+<manifest package="android.support.mediacompat.client"/>
diff --git a/media-compat-test-client/build.gradle b/media-compat-test-client/build.gradle
new file mode 100644
index 0000000..45292e0
--- /dev/null
+++ b/media-compat-test-client/build.gradle
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+apply plugin: android.support.SupportLibraryPlugin
+
+dependencies {
+ api project(':support-annotations')
+ api project(':support-media-compat')
+}
+
+android {
+ defaultConfig {
+ minSdkVersion 14
+ }
+}
\ No newline at end of file
diff --git a/media-compat-test-client/lint-baseline.xml b/media-compat-test-client/lint-baseline.xml
new file mode 100644
index 0000000..8eec225
--- /dev/null
+++ b/media-compat-test-client/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="4" by="lint 3.0.0-alpha6">
+
+</issues>
diff --git a/media-compat-test-client/tests/AndroidManifest.xml b/media-compat-test-client/tests/AndroidManifest.xml
new file mode 100644
index 0000000..89383991
--- /dev/null
+++ b/media-compat-test-client/tests/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2017 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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="android.support.mediacompat.client.test">
+ <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
+</manifest>
diff --git a/media-compat-test-client/tests/NO_DOCS b/media-compat-test-client/tests/NO_DOCS
new file mode 100644
index 0000000..4dad694
--- /dev/null
+++ b/media-compat-test-client/tests/NO_DOCS
@@ -0,0 +1,17 @@
+# Copyright (C) 2017 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.
+
+Having this file, named NO_DOCS, in a directory will prevent
+Android javadocs from being generated for java files under
+the directory. This is especially useful for test projects.
diff --git a/media-compat-test-service/AndroidManifest.xml b/media-compat-test-service/AndroidManifest.xml
new file mode 100644
index 0000000..0390e8a
--- /dev/null
+++ b/media-compat-test-service/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2017 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.
+-->
+<manifest package="android.support.mediacompat.service"/>
diff --git a/media-compat-test-service/build.gradle b/media-compat-test-service/build.gradle
new file mode 100644
index 0000000..baadb12
--- /dev/null
+++ b/media-compat-test-service/build.gradle
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+apply plugin: android.support.SupportLibraryPlugin
+
+dependencies {
+ api project(':support-annotations')
+ api project(':support-media-compat')
+}
+
+android {
+ defaultConfig {
+ minSdkVersion 14
+ }
+}
diff --git a/media-compat-test-service/lint-baseline.xml b/media-compat-test-service/lint-baseline.xml
new file mode 100644
index 0000000..8eec225
--- /dev/null
+++ b/media-compat-test-service/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="4" by="lint 3.0.0-alpha6">
+
+</issues>
diff --git a/media-compat-test-service/tests/AndroidManifest.xml b/media-compat-test-service/tests/AndroidManifest.xml
new file mode 100644
index 0000000..14394ee
--- /dev/null
+++ b/media-compat-test-service/tests/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2017 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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="android.support.mediacompat.service.test">
+ <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
+</manifest>
diff --git a/media-compat-test-service/tests/NO_DOCS b/media-compat-test-service/tests/NO_DOCS
new file mode 100644
index 0000000..4dad694
--- /dev/null
+++ b/media-compat-test-service/tests/NO_DOCS
@@ -0,0 +1,17 @@
+# Copyright (C) 2017 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.
+
+Having this file, named NO_DOCS, in a directory will prevent
+Android javadocs from being generated for java files under
+the directory. This is especially useful for test projects.
diff --git a/settings.gradle b/settings.gradle
index 415cfd3..c4a2a67 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -170,6 +170,18 @@
/////////////////////////////
//
+// Applications for tests
+//
+/////////////////////////////
+
+include ':support-media-compat-test-client'
+project(':support-media-compat-test-client').projectDir = new File(rootDir, 'media-compat-test-client')
+
+include ':support-media-compat-test-service'
+project(':support-media-compat-test-service').projectDir = new File(rootDir, 'media-compat-test-service')
+
+/////////////////////////////
+//
// External
//
/////////////////////////////
