Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5499092f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update conversion results file only when it changed." am: 9a991fab am: f1562952 

Original change: https://android-review.googlesource.com/c/platform/build/+/1896415

Change-Id: Iff544e80dd0ea88fd62bb4008aea81bb80b3d1b4
parents de84cc8b f1562952

core/board_config.mk

+2 −4
Original line number Diff line number Diff line
@@ -214,10 +214,8 @@ else 
    $(error board configuration converter failed: $(.SHELLSTATUS))

  endif



  $(shell $(OUT_DIR)/soong/rbcrun \

    RBC_OUT="make,global" \

    $(OUT_DIR)/rbc/boardlauncher.rbc \

    >$(OUT_DIR)/rbc/rbc_board_config_results.mk)

  $(shell build/soong/scripts/update_out $(OUT_DIR)/rbc/rbc_board_config_results.mk \

    $(OUT_DIR)/soong/rbcrun RBC_OUT="make,global" $(OUT_DIR)/rbc/boardlauncher.rbc)

  ifneq ($(.SHELLSTATUS),0)

    $(error board configuration runner failed: $(.SHELLSTATUS))

  endif

core/product_config.mk

+2 −2
Original line number Diff line number Diff line
@@ -206,8 +206,8 @@ endif 
ifndef RBC_PRODUCT_CONFIG

$(call import-products, $(current_product_makefile))

else

  $(shell build/soong/scripts/rbc-run $(current_product_makefile) \

      >$(OUT_DIR)/rbctemp.mk)

  $(shell build/soong/scripts/update_out $(OUT_DIR)/rbctemp.mk \

      build/soong/scripts/rbc-run $(current_product_makefile))

  ifneq ($(.SHELLSTATUS),0)

    $(error product configuration converter failed: $(.SHELLSTATUS))

  endif