From e99f69a4845c80d46df1674581461d1f8553ed92 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Thu, 10 Jul 2014 20:02:13 +0100
Subject: Add a test multiarch app.

Will be used in an upcoming change for PackageManagerService
handling of multiArch APKs.

Change-Id: I363a02ce7b91569bb86880cf511ab9fbfcf2665c
---
 .../hosttests/test-apps/SharedUid/dual/Android.mk  | 20 +++++++++++++++
 .../test-apps/SharedUid/dual/AndroidManifest.xml   | 29 ----------------------
 .../SharedUid/dual/dual/AndroidManifest.xml        | 29 ++++++++++++++++++++++
 .../SharedUid/dual/multiarch/AndroidManifest.xml   | 29 ++++++++++++++++++++++
 4 files changed, 78 insertions(+), 29 deletions(-)
 delete mode 100644 core/tests/hosttests/test-apps/SharedUid/dual/AndroidManifest.xml
 create mode 100644 core/tests/hosttests/test-apps/SharedUid/dual/dual/AndroidManifest.xml
 create mode 100644 core/tests/hosttests/test-apps/SharedUid/dual/multiarch/AndroidManifest.xml

diff --git a/core/tests/hosttests/test-apps/SharedUid/dual/Android.mk b/core/tests/hosttests/test-apps/SharedUid/dual/Android.mk
index a7dc1bd0..60af2b9 100644
--- a/core/tests/hosttests/test-apps/SharedUid/dual/Android.mk
+++ b/core/tests/hosttests/test-apps/SharedUid/dual/Android.mk
@@ -34,6 +34,26 @@ LOCAL_JNI_SHARED_LIBRARIES = libpmtestdual
 
 LOCAL_PROGUARD_ENABLED := disabled
 
+LOCAL_MANIFEST_FILE := dual/AndroidManifest.xml
+
+LOCAL_SDK_VERSION := current
+include $(BUILD_PACKAGE)
+
+LOCAL_PATH:= $(TOP_LOCAL_PATH)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_PACKAGE_NAME := PMTest_Java_multiarch
+LOCAL_MULTILIB := both
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_MANIFEST_FILE := multiarch/AndroidManifest.xml
+
+LOCAL_JNI_SHARED_LIBRARIES = libpmtestdual
+
+LOCAL_PROGUARD_ENABLED := disabled
+
 LOCAL_SDK_VERSION := current
 include $(BUILD_PACKAGE)
 
diff --git a/core/tests/hosttests/test-apps/SharedUid/dual/AndroidManifest.xml b/core/tests/hosttests/test-apps/SharedUid/dual/AndroidManifest.xml
deleted file mode 100644
index b7ff46a..0000000
--- a/core/tests/hosttests/test-apps/SharedUid/dual/AndroidManifest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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 an example of writing an application that bundles a
-     native code library. -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.framework.shareduid.dual" android:sharedUserId="com.framework.shareduid">
-    <application android:label="Main Activity (dual)">
-        <activity android:name="MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>
diff --git a/core/tests/hosttests/test-apps/SharedUid/dual/dual/AndroidManifest.xml b/core/tests/hosttests/test-apps/SharedUid/dual/dual/AndroidManifest.xml
new file mode 100644
index 0000000..b7ff46a
--- /dev/null
+++ b/core/tests/hosttests/test-apps/SharedUid/dual/dual/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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 an example of writing an application that bundles a
+     native code library. -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.framework.shareduid.dual" android:sharedUserId="com.framework.shareduid">
+    <application android:label="Main Activity (dual)">
+        <activity android:name="MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/core/tests/hosttests/test-apps/SharedUid/dual/multiarch/AndroidManifest.xml b/core/tests/hosttests/test-apps/SharedUid/dual/multiarch/AndroidManifest.xml
new file mode 100644
index 0000000..d53ba50
--- /dev/null
+++ b/core/tests/hosttests/test-apps/SharedUid/dual/multiarch/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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 an example of writing an application that bundles a
+     native code library. -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.framework.shareduid.multiarch" android:sharedUserId="com.framework.shareduid">
+    <application android:label="Main Activity (multiarch)" android:multiArch="true">
+        <activity android:name="com.framework.shareduid.dual.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
-- 
cgit v1.1