diff --git a/AUTHORS b/AUTHORS index 59c7bafa4..bc30ce9fa 100644 --- a/AUTHORS +++ b/AUTHORS @@ -42,6 +42,7 @@ Numfum GmbH Yandex LLC Rive Institute of Software, Chinese Academy of Sciences +Guangdong OPPO Mobile Telecommunications Corp., Ltd Jacek Caban Mark Callow @@ -82,3 +83,4 @@ Akihiko Odaki Ho Cheung Tao Wang Phan Quang Minh +Hongchen Yan diff --git a/android/android.software.angle.xml b/android/android.software.angle.xml new file mode 100644 index 000000000..5b3033220 --- /dev/null +++ b/android/android.software.angle.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/scripts/generate_android_bp.py b/scripts/generate_android_bp.py index 590b9dc3e..d0d90f060 100644 --- a/scripts/generate_android_bp.py +++ b/scripts/generate_android_bp.py @@ -666,7 +666,7 @@ def main(): ], })) - # Add APKs with all of the root libraries + # Add APKs with all of the root libraries and permissions xml blueprint_targets.append(( 'filegroup', { @@ -683,6 +683,14 @@ def main(): 'src/android_system_settings/src/com/android/angle/common/SearchProvider.java', ], })) + + blueprint_targets.append(('prebuilt_etc', { + 'name': 'android.software.angle.xml', + 'src': 'android/android.software.angle.xml', + 'product_specific': True, + 'sub_dir': 'permissions', + })) + blueprint_targets.append(( 'java_defaults', { @@ -705,6 +713,7 @@ def main(): 'privileged': True, 'product_specific': True, 'owner': 'google', + 'required': ['android.software.angle.xml'], })) blueprint_targets.append(('android_library', {