Merge "Add support for auto-generated characteristics RRO" into main am: 8fc7cf6301
Original change: https://android-review.googlesource.com/c/platform/build/+/2818463 Change-Id: I39101709a273ed25f4588c7d11694daa14a7cc17 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -4,6 +4,7 @@
|
|||||||
# Fakes don't get installed, and NDK stubs aren't installed to device.
|
# Fakes don't get installed, and NDK stubs aren't installed to device.
|
||||||
static_allowed_patterns := $(TARGET_OUT_FAKE)/% $(SOONG_OUT_DIR)/ndk/%
|
static_allowed_patterns := $(TARGET_OUT_FAKE)/% $(SOONG_OUT_DIR)/ndk/%
|
||||||
# RROs become REQUIRED by the source module, but are always placed on the vendor partition.
|
# RROs become REQUIRED by the source module, but are always placed on the vendor partition.
|
||||||
|
static_allowed_patterns += %__auto_generated_characteristics_rro.apk
|
||||||
static_allowed_patterns += %__auto_generated_rro_product.apk
|
static_allowed_patterns += %__auto_generated_rro_product.apk
|
||||||
static_allowed_patterns += %__auto_generated_rro_vendor.apk
|
static_allowed_patterns += %__auto_generated_rro_vendor.apk
|
||||||
# Auto-included targets are not considered
|
# Auto-included targets are not considered
|
||||||
|
@@ -96,3 +96,13 @@ python_test_host {
|
|||||||
unit_test: true,
|
unit_test: true,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
python_binary_host {
|
||||||
|
name: "characteristics_rro_generator",
|
||||||
|
srcs: ["characteristics_rro_generator.py"],
|
||||||
|
version: {
|
||||||
|
py3: {
|
||||||
|
embedded_launcher: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
23
tools/characteristics_rro_generator.py
Normal file
23
tools/characteristics_rro_generator.py
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
import sys
|
||||||
|
from xml.dom.minidom import parseString
|
||||||
|
|
||||||
|
def parse_package(manifest):
|
||||||
|
with open(manifest, 'r') as f:
|
||||||
|
data = f.read()
|
||||||
|
dom = parseString(data)
|
||||||
|
return dom.documentElement.getAttribute('package')
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
if len(sys.argv) != 3:
|
||||||
|
sys.exit(f"usage: {sys_argv[0]} target_package_manifest output\n")
|
||||||
|
package_name = parse_package(sys.argv[1])
|
||||||
|
with open(sys.argv[2], "w") as f:
|
||||||
|
f.write(f'''<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="{package_name}.auto_generated_characteristics_rro">
|
||||||
|
<application android:hasCode="false" />
|
||||||
|
<overlay android:targetPackage="{package_name}"
|
||||||
|
android:isStatic="true"
|
||||||
|
android:priority="0" />
|
||||||
|
</manifest>
|
||||||
|
''')
|
Reference in New Issue
Block a user