diff options
| author | dcashman <dcashman@google.com> | 2014-07-12 13:04:20 -0700 |
|---|---|---|
| committer | dcashman <dcashman@google.com> | 2014-07-12 13:04:20 -0700 |
| commit | 5de7377feca5242fe7127e2d4dc7792d4886d365 (patch) | |
| tree | c7ac7801388c9572702b3c2440f0efc60ccc17b3 /core/tests/coretests/apks | |
| parent | 405912bce074e9e59a246e2357a108e50dffabf8 (diff) | |
| download | frameworks_base-5de7377feca5242fe7127e2d4dc7792d4886d365.zip frameworks_base-5de7377feca5242fe7127e2d4dc7792d4886d365.tar.gz frameworks_base-5de7377feca5242fe7127e2d4dc7792d4886d365.tar.bz2 | |
Revert "Initial KeySet API."
This reverts commit 9a643fe02bc960e266484547dda5572b094a4c72.
Diffstat (limited to 'core/tests/coretests/apks')
| -rw-r--r-- | core/tests/coretests/apks/keyset/Android.mk | 17 | ||||
| -rw-r--r-- | core/tests/coretests/apks/keyset/api_test/AndroidManifest.xml | 20 |
2 files changed, 0 insertions, 37 deletions
diff --git a/core/tests/coretests/apks/keyset/Android.mk b/core/tests/coretests/apks/keyset/Android.mk index 306dc90..e44ac6c 100644 --- a/core/tests/coretests/apks/keyset/Android.mk +++ b/core/tests/coretests/apks/keyset/Android.mk @@ -88,21 +88,4 @@ LOCAL_PACKAGE_NAME := keyset_sau_ub LOCAL_CERTIFICATE := $(LOCAL_PATH)/../../certs/keyset_A LOCAL_ADDITIONAL_CERTIFICATES := $(LOCAL_PATH)/../../certs/keyset_B LOCAL_MANIFEST_FILE := uB/AndroidManifest.xml -include $(FrameworkCoreTests_BUILD_PACKAGE) - -#apks signed by platform only -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_PACKAGE_NAME := keyset_splat_api -LOCAL_CERTIFICATE := platform -LOCAL_MANIFEST_FILE := api_test/AndroidManifest.xml -include $(FrameworkCoreTests_BUILD_PACKAGE) - -#apks signed by platform and keyset_A -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_PACKAGE_NAME := keyset_splata_api -LOCAL_CERTIFICATE := platform -LOCAL_ADDITIONAL_CERTIFICATES := $(LOCAL_PATH)/../../certs/keyset_A -LOCAL_MANIFEST_FILE := api_test/AndroidManifest.xml include $(FrameworkCoreTests_BUILD_PACKAGE)
\ No newline at end of file diff --git a/core/tests/coretests/apks/keyset/api_test/AndroidManifest.xml b/core/tests/coretests/apks/keyset/api_test/AndroidManifest.xml deleted file mode 100644 index 4c7e968..0000000 --- a/core/tests/coretests/apks/keyset/api_test/AndroidManifest.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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="com.android.frameworks.coretests.keysets_api"> - <application android:hasCode="false"> - </application> -</manifest> |