diff options
| author | Treehugger Robot <android-build-prod@system.gserviceaccount.com> | 2020-10-20 03:05:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-20 03:05:46 +0000 |
| commit | 096f44004766e357a6d089a0530fd51211079329 (patch) | |
| tree | faaef0a534f1db572916bdf764e357647546faf1 /envsetup.sh | |
| parent | 1f8509e9e27798b8de8d15fdc92f76d0adf9d649 (diff) | |
| parent | 50842ae015137988f5db5fd769975040d90aa4c6 (diff) | |
Merge changes from topic "am-b1508dde-d998-419e-8b42-0002dca56ab7" into s-keystone-qcom-dev
* changes:
[automerger] Remove hidl-gen script trigger am: b1bba8d14a
Remove hidl-gen script trigger
Diffstat (limited to 'envsetup.sh')
| -rw-r--r-- | envsetup.sh | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/envsetup.sh b/envsetup.sh index 7af31bcb2e..8155b129f3 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -1586,36 +1586,6 @@ function mmma() function make() { - call_hook ${FUNCNAME[0]} $@ - if [ $? -ne 0 ]; then - return 1 - fi - - if [ -f $ANDROID_BUILD_TOP/$QTI_BUILDTOOLS_DIR/build/update-vendor-hal-makefiles.sh ]; then - vendor_hal_script=$ANDROID_BUILD_TOP/$QTI_BUILDTOOLS_DIR/build/update-vendor-hal-makefiles.sh - source $vendor_hal_script --check - regen_needed=$? - else - vendor_hal_script=$ANDROID_BUILD_TOP/device/qcom/common/vendor_hal_makefile_generator.sh - regen_needed=1 - fi - - if [ $regen_needed -eq 1 ]; then - _wrap_build $(get_make_command hidl-gen) hidl-gen ALLOW_MISSING_DEPENDENCIES=true - RET=$? - if [ $RET -ne 0 ]; then - echo -n "${color_failed}#### hidl-gen compilation failed, check above errors" - echo " ####${color_reset}" - return $RET - fi - source $vendor_hal_script - RET=$? - if [ $RET -ne 0 ]; then - echo -n "${color_failed}#### HAL file .bp generation failed dure to incpomaptible HAL files , please check above error log" - echo " ####${color_reset}" - return $RET - fi - fi _wrap_build $(get_make_command "$@") "$@" } |