Fix build in Permission up, make test apps data, not system apps.
Test: built
Change-Id: I75e5781b4d8ef0e3597c2111ff163838b5604ba3
diff --git a/PermissionApp/Android.mk b/PermissionApp/Android.mk
index 00170ca..1111750 100644
--- a/PermissionApp/Android.mk
+++ b/PermissionApp/Android.mk
@@ -2,12 +2,11 @@
include $(CLEAR_VARS)
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := PermissionApp
-#LOCAL_CERTIFICATE := platform
-
include $(BUILD_PACKAGE)
diff --git a/PermissionApp/AndroidManifest.xml b/PermissionApp/AndroidManifest.xml
index 8f35b34..c47fb6c 100644
--- a/PermissionApp/AndroidManifest.xml
+++ b/PermissionApp/AndroidManifest.xml
@@ -3,7 +3,6 @@
android:versionCode="1"
android:versionName="1.0">
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="22"/>
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.WRITE_CONTACTS" />
diff --git a/PermissionApp/src/foo/bar/permission/PermissionActivity.java b/PermissionApp/src/foo/bar/permission/PermissionActivity.java
index 529eccf..eb1d779 100644
--- a/PermissionApp/src/foo/bar/permission/PermissionActivity.java
+++ b/PermissionApp/src/foo/bar/permission/PermissionActivity.java
@@ -20,13 +20,9 @@
import android.app.Activity;
import android.app.LoaderManager;
import android.bluetooth.BluetoothDevice;
-import android.companion.AssociationRequest;
-import android.companion.BluetoothDeviceFilter;
-import android.companion.BluetoothLEDeviceFilter;
import android.companion.CompanionDeviceManager;
import android.content.CursorLoader;
import android.content.Intent;
-import android.content.IntentSender;
import android.content.Loader;
import android.content.pm.PackageManager;
import android.database.Cursor;
diff --git a/PrintApp/Android.mk b/PrintApp/Android.mk
index 81ab231..f09a7ea 100644
--- a/PrintApp/Android.mk
+++ b/PrintApp/Android.mk
@@ -2,6 +2,7 @@
include $(CLEAR_VARS)
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/PrintService/Android.mk b/PrintService/Android.mk
index 6d4ff7f..8581d35 100644
--- a/PrintService/Android.mk
+++ b/PrintService/Android.mk
@@ -2,6 +2,7 @@
include $(CLEAR_VARS)
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src)
