diff options
| author | Jae Shin <jaeshin@google.com> | 2018-08-09 12:57:20 +0900 |
|---|---|---|
| committer | Justin Yun <justinyun@google.com> | 2018-10-30 12:05:24 +0900 |
| commit | 7ebc00199cfbd9f9671f278ae499afafd2aa41d3 (patch) | |
| tree | d7c37e7b67576b0a40a913d4c940e4824c3a3f53 | |
| parent | 66118192e209f4bd3105889a63ff722f28ea0c69 (diff) | |
| download | android_development-7ebc00199cfbd9f9671f278ae499afafd2aa41d3.tar.gz android_development-7ebc00199cfbd9f9671f278ae499afafd2aa41d3.tar.bz2 android_development-7ebc00199cfbd9f9671f278ae499afafd2aa41d3.zip | |
Check first if system_dir and device_dir exists
Change the order of variable checking so it is clear whether
the system_dir or device_dir does not exist or a specific file
in the *_dir does not exist.
Test: build_mixed system_dir device_dir dist_dir
Merged-In: I0d61ea11c3bd22ef12eccbb46b8f665414188307
Change-Id: I0d61ea11c3bd22ef12eccbb46b8f665414188307
(cherry picked from commit 52edf8fb4f5eaa8f6c6c13a1a87a34311ccb76ed)
(cherry picked from commit f418b9b9e55fc1d4e658a2942ed7bb6ce1972836)
| -rwxr-xr-x | vndk/tools/build_mixed | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vndk/tools/build_mixed b/vndk/tools/build_mixed index aacf635c7..5abba5031 100755 --- a/vndk/tools/build_mixed +++ b/vndk/tools/build_mixed @@ -70,14 +70,6 @@ fi shift "$((OPTIND-1))" -if [[ ! -z "${MODIFY_SYSTEM_SCRIPT+x}" && ! -f "$MODIFY_SYSTEM_SCRIPT" ]]; then - exit_badparam "Script not found: "$MODIFY_SYSTEM_SCRIPT"" -fi - -if [[ ! -z "${OVERRIDE_VBMETA_IMAGE_PATH+x}" && ! -f "$OVERRIDE_VBMETA_IMAGE_PATH" ]]; then - exit_badparam "Specified vbmeta.img not found: "$OVERRIDE_VBMETA_IMAGE_PATH"" -fi - if [[ $# -lt 3 ]]; then exit_badparam "Unexpected number of arguments" fi @@ -103,6 +95,14 @@ if [[ ! -f "$DEVICE_TARGET_FILES_ARCHIVE" ]]; then exit_badparam "Could not find device target_files archive in $DEVICE_DIR." fi +if [[ ! -z "${MODIFY_SYSTEM_SCRIPT+x}" && ! -f "$MODIFY_SYSTEM_SCRIPT" ]]; then + exit_badparam "Script not found: "$MODIFY_SYSTEM_SCRIPT"" +fi + +if [[ ! -z "${OVERRIDE_VBMETA_IMAGE_PATH+x}" && ! -f "$OVERRIDE_VBMETA_IMAGE_PATH" ]]; then + exit_badparam "Specified vbmeta.img not found: "$OVERRIDE_VBMETA_IMAGE_PATH"" +fi + readonly DEVICE_ARTIFACTS_DIR="$TEMP_DIR"/device_archive_artifacts readonly DEVICE_IMAGES_DIR="$DEVICE_ARTIFACTS_DIR"/IMAGES readonly SYSTEM_ARTIFACTS_DIR="$TEMP_DIR"/system_artifacts |