diff options
author | Dennis Song <denniscy@google.com> | 2024-02-02 04:09:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-02 04:09:31 +0000 |
commit | 707563d47980d0751ae072fa90d8b1762f182025 (patch) | |
tree | f1b8f5ae33ebeaf54612aa08d1df0839a7ab97e8 | |
parent | f568774e3c38d9204bd340951de902032a533305 (diff) | |
parent | 435c35122a3f3ced5ef12248f8eec45295181051 (diff) | |
download | treble-707563d47980d0751ae072fa90d8b1762f182025.tar.gz |
Support release target config for build_android_sandboxed am: 435c35122a
Original change: https://android-review.googlesource.com/c/platform/tools/treble/+/2943309
Change-Id: I000ddd66e06be1fe585ec96d326100552752db0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | build/sandbox/build_android_sandboxed.py | 9 | ||||
-rw-r--r-- | build/sandbox/build_android_sandboxed_test.py | 16 |
2 files changed, 19 insertions, 6 deletions
diff --git a/build/sandbox/build_android_sandboxed.py b/build/sandbox/build_android_sandboxed.py index 8518074..3f0b528 100644 --- a/build/sandbox/build_android_sandboxed.py +++ b/build/sandbox/build_android_sandboxed.py @@ -24,6 +24,7 @@ _DEFAULT_COMMAND_WRAPPER = \ def build(build_target, + release_target, variant, nsjail_bin, chroot, @@ -40,6 +41,7 @@ def build(build_target, Args: build_target: A string with the name of the build target. + release_target: The release target config, e.g., next, trunk_food, ... variant: A string with the build variant. nsjail_bin: A string with the path to the nsjail binary. chroot: A string with the path to the chroot of the NsJail sandbox. @@ -73,7 +75,7 @@ def build(build_target, source_dir = os.getcwd() command = [ command_wrapper, - '%s-%s' % (android_target, variant), + '%s-%s-%s' % (android_target, release_target, variant), '/src', 'make', '-j', @@ -116,6 +118,10 @@ def arg_parser(): description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter) parser.add_argument('--build_target', help='The build target.') parser.add_argument( + '--release_target', + required=True, + help='Release target config, e.g., next, trunk_food, trunk_staging, ...') + parser.add_argument( '--variant', default='userdebug', help='The Android build variant.') parser.add_argument( '--nsjail_bin', required=True, help='Path to NsJail binary.') @@ -199,6 +205,7 @@ def main(): build( build_target=args['build_target'], + release_target=args['release_target'], variant=args['variant'], nsjail_bin=args['nsjail_bin'], chroot=args['chroot'], diff --git a/build/sandbox/build_android_sandboxed_test.py b/build/sandbox/build_android_sandboxed_test.py index d4848c4..e8ddea2 100644 --- a/build/sandbox/build_android_sandboxed_test.py +++ b/build/sandbox/build_android_sandboxed_test.py @@ -26,6 +26,7 @@ class BuildAndroidSandboxedTest(unittest.TestCase): os.chdir('/') commands = build_android_sandboxed.build( 'target_name', + 'release_target', 'userdebug', nsjail_bin='/bin/true', chroot='/chroot', @@ -47,7 +48,7 @@ class BuildAndroidSandboxedTest(unittest.TestCase): '--bindmount', '/dist_dir:/dist', '--', '/src/tools/treble/build/sandbox/build_android_target.sh', - 'target_name-userdebug', + 'target_name-release_target-userdebug', '/src', 'make', '-j', 'droid', 'dist', ] @@ -58,6 +59,7 @@ class BuildAndroidSandboxedTest(unittest.TestCase): os.chdir('/') commands = build_android_sandboxed.build( 'target_name', + 'release_target', 'userdebug', nsjail_bin='/bin/true', command_wrapper='/command/wrapper', @@ -80,7 +82,7 @@ class BuildAndroidSandboxedTest(unittest.TestCase): '--bindmount', '/dist_dir:/dist', '--', '/command/wrapper', - 'target_name-userdebug', + 'target_name-release_target-userdebug', '/src', 'make', '-j', 'droid', 'dist', ] @@ -91,6 +93,7 @@ class BuildAndroidSandboxedTest(unittest.TestCase): os.chdir('/') commands = build_android_sandboxed.build( 'target_name', + 'release_target', 'user', nsjail_bin='/bin/true', chroot='/chroot', @@ -112,7 +115,7 @@ class BuildAndroidSandboxedTest(unittest.TestCase): '--bindmount', '/dist_dir:/dist', '--', '/src/tools/treble/build/sandbox/build_android_target.sh', - 'target_name-user', + 'target_name-release_target-user', '/src', 'make', '-j', 'droid', 'dist', ] @@ -123,6 +126,7 @@ class BuildAndroidSandboxedTest(unittest.TestCase): os.chdir('/') commands = build_android_sandboxed.build( 'target_name', + 'release_target', 'userdebug', nsjail_bin='/bin/true', chroot='/chroot', @@ -144,7 +148,7 @@ class BuildAndroidSandboxedTest(unittest.TestCase): '--bindmount', '/dist_dir:/dist', '--', '/src/tools/treble/build/sandbox/build_android_target.sh', - 'target_name-userdebug', + 'target_name-release_target-userdebug', '/src', 'make', '-j', 'droid', 'dist', 'extra_build_target' @@ -167,6 +171,7 @@ class BuildAndroidSandboxedTest(unittest.TestCase): os.chdir('/') skip_commands = build_android_sandboxed.build( 'target_skip', + 'release_target', 'userdebug', nsjail_bin='/bin/true', chroot='/chroot', @@ -182,6 +187,7 @@ class BuildAndroidSandboxedTest(unittest.TestCase): os.chdir('/') commands = build_android_sandboxed.build( 'target_name', + 'release_target', 'userdebug', nsjail_bin='/bin/true', chroot='/chroot', @@ -206,7 +212,7 @@ class BuildAndroidSandboxedTest(unittest.TestCase): '--env', 'second_env_var=second_value', '--', '/src/tools/treble/build/sandbox/build_android_target.sh', - 'target_name-userdebug', + 'target_name-release_target-userdebug', '/src', 'make', '-j', 'droid', 'dist', ] |