Fix auto-generate-resources.py
- Some paths were not updated when refactoring the chassis project structure
- lxml stopped working for everyone for some reason...
But seems to work fine on python3. Maybe this was a glinux update?
Fixes: 164131545
Test: Manually
Change-Id: I4ef7375b555e64ac10f1ec82c8601601d0493c4a
diff --git a/car-ui-lib/tests/apitest/auto-generate-resources.py b/car-ui-lib/tests/apitest/auto-generate-resources.py
index 1f40a55..db9c0ef 100755
--- a/car-ui-lib/tests/apitest/auto-generate-resources.py
+++ b/car-ui-lib/tests/apitest/auto-generate-resources.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright 2019, The Android Open Source Project
#
@@ -47,7 +47,7 @@
if args.compare:
compare_resources(ROOT_FOLDER+'/car-ui-lib/src/main/res', OUTPUT_FILE_PATH + 'current.xml')
else:
- generate_current_file(ROOT_FOLDER+'/res', output_file)
+ generate_current_file(ROOT_FOLDER+'/car-ui-lib/src/main/res', output_file)
def generate_current_file(res_folder, output_file='current.xml'):
resources = get_all_resources(res_folder)
@@ -67,7 +67,7 @@
data = etree.ElementTree(root)
- with open(OUTPUT_FILE_PATH + output_file, 'w') as f:
+ with open(OUTPUT_FILE_PATH + output_file, 'wb') as f:
data.write(f, pretty_print=True, xml_declaration=True, encoding='utf-8')
def generate_overlayable_file(res_folder):
@@ -124,8 +124,8 @@
data = etree.ElementTree(root)
- output_file=ROOT_FOLDER+'/res/values/overlayable.xml'
- with open(output_file, 'w') as f:
+ output_file=ROOT_FOLDER+'/car-ui-lib/src/main/res/values/overlayable.xml'
+ with open(output_file, 'wb') as f:
data.write(f, pretty_print=True, xml_declaration=True, encoding='utf-8')
def compare_resources(res_folder, res_public_file):
diff --git a/car-ui-lib/tests/apitest/git_utils.py b/car-ui-lib/tests/apitest/git_utils.py
index d3b83a5..9d19432 100755
--- a/car-ui-lib/tests/apitest/git_utils.py
+++ b/car-ui-lib/tests/apitest/git_utils.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright 2019, The Android Open Source Project
#
diff --git a/car-ui-lib/tests/apitest/resource_utils.py b/car-ui-lib/tests/apitest/resource_utils.py
index 8429d33..763c5a0 100755
--- a/car-ui-lib/tests/apitest/resource_utils.py
+++ b/car-ui-lib/tests/apitest/resource_utils.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright 2019, The Android Open Source Project
#
diff --git a/car-ui-lib/tests/apitest/verify_rro.py b/car-ui-lib/tests/apitest/verify_rro.py
index a58210d..80c0f3e 100755
--- a/car-ui-lib/tests/apitest/verify_rro.py
+++ b/car-ui-lib/tests/apitest/verify_rro.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright 2019, The Android Open Source Project
#
