Androd Q CTS CtsSecurityTestCases - PullRequest
       48

Androd Q CTS CtsSecurityTestCases

0 голосов
/ 28 апреля 2020

Я хочу заменить по умолчанию android testkey на ключ release, созданный мной для теста CTS CtsSecurityTestCases. Некоторые apks были успешно заменены, но некоторые ключи APK не были заменены, и оригинальный testkey все еще используется.

+++ b/build/make/core/Makefile
@@ -300,11 +300,12 @@ endif
 # non-default dev keys (usually private keys from a vendor directory).
 # Both of these tags will be removed and replaced with "release-keys"
 # when the target-files is signed in a post-build step.
-ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/target/product/security/testkey)
-BUILD_KEYS := test-keys
-else
-BUILD_KEYS := dev-keys
-endif
+# ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/target/product/security/testkey)
+# BUILD_KEYS := test-keys
+# else
+# BUILD_KEYS := dev-keys
+# endif
+BUILD_KEYS := release-keys
 BUILD_VERSION_TAGS += $(BUILD_KEYS)
 BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS)))

--- a/build/make/core/config.mk
+++ b/build/make/core/config.mk
@@ -762,11 +762,12 @@ ifdef PRODUCT_SHIPPING_API_LEVEL
 endif

 # The default key if not set as LOCAL_CERTIFICATE
-ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE
-  DEFAULT_SYSTEM_DEV_CERTIFICATE := $(PRODUCT_DEFAULT_DEV_CERTIFICATE)
-else
-  DEFAULT_SYSTEM_DEV_CERTIFICATE := build/target/product/security/testkey
-endif
+#ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE
+#  DEFAULT_SYSTEM_DEV_CERTIFICATE := $(PRODUCT_DEFAULT_DEV_CERTIFICATE)
+#else
+#  DEFAULT_SYSTEM_DEV_CERTIFICATE := build/target/product/security/testkey
+#endif
+DEFAULT_SYSTEM_DEV_CERTIFICATE := build/target/product/security/releasekey
 .KATI_READONLY := DEFAULT_SYSTEM_DEV_CERTIFICATE
...