StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert $(LOCAL_PATH) handling for certificate and

Browse Source 
`additional_certificates` properties.

Bug: 122728056
Test: builtin tests
Change-Id: I96f84bf7396447b0207438a4073c864f2d9b1ab7
This commit is contained in:
Sasha Smundak
2019-03-01 11:11:10 -08:00
parent 6a48032fc9
commit aa7fdad7f3
2 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
androidmk/cmd/androidmk/android.go
View File

@@ -42,26 +42,24 @@ type variableAssignmentContext struct {
var rewriteProperties = map[string](func(variableAssignmentContext) error){ var rewriteProperties = map[string](func(variableAssignmentContext) error){
// custom functions // custom functions
"LOCAL_32_BIT_ONLY": local32BitOnly, "LOCAL_32_BIT_ONLY": local32BitOnly,
"LOCAL_ADDITIONAL_CERTIFICATES": localizePathList("additional_certificates"), "LOCAL_AIDL_INCLUDES": localAidlIncludes,
"LOCAL_AIDL_INCLUDES": localAidlIncludes, "LOCAL_ASSET_DIR": localizePathList("asset_dirs"),
"LOCAL_ASSET_DIR": localizePathList("asset_dirs"), "LOCAL_C_INCLUDES": localIncludeDirs,
"LOCAL_C_INCLUDES": localIncludeDirs, "LOCAL_EXPORT_C_INCLUDE_DIRS": exportIncludeDirs,
"LOCAL_CERTIFICATE": localizePath("certificate"), "LOCAL_JARJAR_RULES": localizePath("jarjar_rules"),
"LOCAL_EXPORT_C_INCLUDE_DIRS": exportIncludeDirs, "LOCAL_LDFLAGS": ldflags,
"LOCAL_JARJAR_RULES": localizePath("jarjar_rules"), "LOCAL_MODULE_CLASS": prebuiltClass,
"LOCAL_LDFLAGS": ldflags, "LOCAL_MODULE_STEM": stem,
"LOCAL_MODULE_CLASS": prebuiltClass, "LOCAL_MODULE_HOST_OS": hostOs,
"LOCAL_MODULE_STEM": stem, "LOCAL_RESOURCE_DIR": localizePathList("resource_dirs"),
"LOCAL_MODULE_HOST_OS": hostOs, "LOCAL_SANITIZE": sanitize(""),
"LOCAL_RESOURCE_DIR": localizePathList("resource_dirs"), "LOCAL_SANITIZE_DIAG": sanitize("diag."),
"LOCAL_SANITIZE": sanitize(""), "LOCAL_STRIP_MODULE": strip(),
"LOCAL_SANITIZE_DIAG": sanitize("diag."), "LOCAL_CFLAGS": cflags,
"LOCAL_STRIP_MODULE": strip(), "LOCAL_UNINSTALLABLE_MODULE": invert("installable"),
"LOCAL_CFLAGS": cflags, "LOCAL_PROGUARD_ENABLED": proguardEnabled,
"LOCAL_UNINSTALLABLE_MODULE": invert("installable"), "LOCAL_MODULE_PATH": prebuiltModulePath,
"LOCAL_PROGUARD_ENABLED": proguardEnabled,
"LOCAL_MODULE_PATH": prebuiltModulePath,
// composite functions // composite functions
"LOCAL_MODULE_TAGS": includeVariableIf(bpVariable{"tags", bpparser.ListType}, not(valueDumpEquals("optional"))), "LOCAL_MODULE_TAGS": includeVariableIf(bpVariable{"tags", bpparser.ListType}, not(valueDumpEquals("optional"))),
@@ -98,6 +96,7 @@ func init() {
"LOCAL_MIN_SDK_VERSION": "min_sdk_version", "LOCAL_MIN_SDK_VERSION": "min_sdk_version",
"LOCAL_NDK_STL_VARIANT": "stl", "LOCAL_NDK_STL_VARIANT": "stl",
"LOCAL_JAR_MANIFEST": "manifest", "LOCAL_JAR_MANIFEST": "manifest",
"LOCAL_CERTIFICATE": "certificate",
"LOCAL_PACKAGE_NAME": "name", "LOCAL_PACKAGE_NAME": "name",
"LOCAL_MODULE_RELATIVE_PATH": "relative_install_path", "LOCAL_MODULE_RELATIVE_PATH": "relative_install_path",
"LOCAL_PROTOC_OPTIMIZE_TYPE": "proto.type", "LOCAL_PROTOC_OPTIMIZE_TYPE": "proto.type",
@@ -163,6 +162,7 @@ func init() {
// java_library_static to android_library. // java_library_static to android_library.
"LOCAL_SHARED_ANDROID_LIBRARIES": "android_libs", "LOCAL_SHARED_ANDROID_LIBRARIES": "android_libs",
"LOCAL_STATIC_ANDROID_LIBRARIES": "android_static_libs", "LOCAL_STATIC_ANDROID_LIBRARIES": "android_static_libs",
"LOCAL_ADDITIONAL_CERTIFICATES": "additional_certificates",
// Jacoco filters: // Jacoco filters:
"LOCAL_JACK_COVERAGE_INCLUDE_FILTER": "jacoco.include_filter", "LOCAL_JACK_COVERAGE_INCLUDE_FILTER": "jacoco.include_filter",
@@ -918,6 +918,7 @@ var moduleTypes = map[string]string{
"BUILD_HOST_DALVIK_JAVA_LIBRARY": "java_library_host_dalvik", "BUILD_HOST_DALVIK_JAVA_LIBRARY": "java_library_host_dalvik",
"BUILD_PACKAGE": "android_app", "BUILD_PACKAGE": "android_app",
"BUILD_CTS_EXECUTABLE": "cc_binary", // will be further massaged by bpfix depending on the output path
"BUILD_CTS_SUPPORT_PACKAGE": "cts_support_package", // will be rewritten to android_test by bpfix "BUILD_CTS_SUPPORT_PACKAGE": "cts_support_package", // will be rewritten to android_test by bpfix
"BUILD_CTS_PACKAGE": "cts_package", // will be rewritten to android_test by bpfix "BUILD_CTS_PACKAGE": "cts_package", // will be rewritten to android_test by bpfix
"BUILD_CTS_TARGET_JAVA_LIBRARY": "cts_target_java_library", // will be rewritten to java_library by bpfix "BUILD_CTS_TARGET_JAVA_LIBRARY": "cts_target_java_library", // will be rewritten to java_library by bpfix

7
androidmk/cmd/androidmk/androidmk_test.go
View File

@@ -118,8 +118,6 @@ include $(CLEAR_VARS)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res $(LOCAL_PATH)/res2 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res $(LOCAL_PATH)/res2
LOCAL_ASSET_DIR := $(LOCAL_PATH)/asset LOCAL_ASSET_DIR := $(LOCAL_PATH)/asset
LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
LOCAL_CERTIFICATE := $(LOCAL_PATH)/cert
LOCAL_ADDITIONAL_CERTIFICATES := $(LOCAL_PATH)/cert1 $(LOCAL_PATH)/cert2
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)
`, `,
expected: ` expected: `
@@ -130,11 +128,6 @@ android_app {
], ],
asset_dirs: ["asset"], asset_dirs: ["asset"],
jarjar_rules: "jarjar-rules.txt", jarjar_rules: "jarjar-rules.txt",
certificate: "cert",
additional_certificates: [
"cert1",
"cert2",
],
}`, }`,
}, },
{ {