diff options
| author | dcashman <dcashman@google.com> | 2014-06-09 09:27:54 -0700 |
|---|---|---|
| committer | dcashman <dcashman@google.com> | 2014-07-14 12:50:51 -0700 |
| commit | 9d2f441f9bb2c8dcac1150e2cba1d15a86a4efb1 (patch) | |
| tree | 7ddba4a062aac803b3329dfc311b8f474ea5d677 /core/tests/coretests/apks | |
| parent | a4ab780877808dbee334f7c7cc4acefa0aa313b2 (diff) | |
| download | frameworks_base-9d2f441f9bb2c8dcac1150e2cba1d15a86a4efb1.zip frameworks_base-9d2f441f9bb2c8dcac1150e2cba1d15a86a4efb1.tar.gz frameworks_base-9d2f441f9bb2c8dcac1150e2cba1d15a86a4efb1.tar.bz2 | |
Initial KeySet API.
Previously submitted but reverted due to doc-compilation bug.
Bug: 6967056
Change-Id: I9bd7ef299a4c92c4b327f5b5d7e951f0753b4c8a
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, 37 insertions, 0 deletions
diff --git a/core/tests/coretests/apks/keyset/Android.mk b/core/tests/coretests/apks/keyset/Android.mk index e44ac6c..306dc90 100644 --- a/core/tests/coretests/apks/keyset/Android.mk +++ b/core/tests/coretests/apks/keyset/Android.mk @@ -88,4 +88,21 @@ 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 new file mode 100644 index 0000000..4c7e968 --- /dev/null +++ b/core/tests/coretests/apks/keyset/api_test/AndroidManifest.xml @@ -0,0 +1,20 @@ +<?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> |