diff options
| author | Vladimir Marko <vmarko@google.com> | 2018-12-03 18:44:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-03 18:44:49 +0000 |
| commit | ee45798b02c3a9fffa9c4b5c1fe0fe03a423df66 (patch) | |
| tree | 61054ce8dae4b30654d41a1ba2f1394ef1c28484 /tools | |
| parent | 9f27ffa9031431267ae59ee3469c853355811916 (diff) | |
| parent | 00fe35e4021e9a8679eca3ffaede48fd89b56258 (diff) | |
| download | art-ee45798b02c3a9fffa9c4b5c1fe0fe03a423df66.tar.gz art-ee45798b02c3a9fffa9c4b5c1fe0fe03a423df66.tar.bz2 art-ee45798b02c3a9fffa9c4b5c1fe0fe03a423df66.zip | |
Merge "Revert "Reduce core image to core-{oj,libart,simple}.""
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/bootjars.sh | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/tools/bootjars.sh b/tools/bootjars.sh index ecd7084d17..dca209d580 100755 --- a/tools/bootjars.sh +++ b/tools/bootjars.sh @@ -54,7 +54,7 @@ done if [[ $mode == target ]]; then if [[ $core_jars_only == y ]]; then - selected_env_var=TARGET_TEST_CORE_JARS + selected_env_var=TARGET_CORE_JARS else selected_env_var=PRODUCT_BOOT_JARS fi @@ -64,31 +64,11 @@ elif [[ $mode == host ]]; then echo "Error: --host does not have non-core boot jars, --core required" >&2 exit 1 fi - selected_env_var=HOST_TEST_CORE_JARS + selected_env_var=HOST_CORE_JARS intermediates_env_var=HOST_OUT_COMMON_INTERMEDIATES fi -if [[ $core_jars_only == y ]]; then - # FIXME: The soong invocation we're using for getting the variables does not give us anything - # defined in Android.common_path.mk, otherwise we would just use HOST-/TARGET_TEST_CORE_JARS. - - # The core_jars_list must match the TEST_CORE_JARS variable in the Android.common_path.mk . - core_jars_list="core-oj core-libart core-simple" - core_jars_suffix= - if [[ $mode == target ]]; then - core_jars_suffix=-testdex - elif [[ $mode == host ]]; then - core_jars_suffix=-hostdex - fi - boot_jars_list="" - boot_separator="" - for boot_module in ${core_jars_list}; do - boot_jars_list+="${boot_separator}${boot_module}${core_jars_suffix}" - boot_separator=" " - done -else - boot_jars_list=$(get_build_var "$selected_env_var") -fi +boot_jars_list=$(get_build_var "$selected_env_var") # Print only the list of boot jars. if [[ $print_file_path == n ]]; then |