Merge "AIDEGen: Adopt prebuilt mechanism to bypass 'm aidegen'."
am: ed9baf88dd
Change-Id: I0c4bb61c81ca7da61f2fb58b27ffc9d4dddb433b
This commit is contained in:
commit
5d717bfb0f
2 changed files with 16 additions and 0 deletions
|
@ -519,6 +519,9 @@ $(call add-clean-step, rm -f $(HOST_OUT)/*ts/host-libprotobuf-java-*.jar)
|
||||||
|
|
||||||
$(call add-clean-step, find $(OUT_DIR)/target/product/mainline_arm64/system -type f -name "*.*dex" -print0 | xargs -0 rm -f)
|
$(call add-clean-step, find $(OUT_DIR)/target/product/mainline_arm64/system -type f -name "*.*dex" -print0 | xargs -0 rm -f)
|
||||||
|
|
||||||
|
# Clean up aidegen
|
||||||
|
$(call add-clean-step, rm -f $(HOST_OUT)/bin/aidegen)
|
||||||
|
|
||||||
# ************************************************
|
# ************************************************
|
||||||
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
|
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
|
||||||
# ************************************************
|
# ************************************************
|
||||||
|
|
13
envsetup.sh
13
envsetup.sh
|
@ -1625,6 +1625,19 @@ function acloud()
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function aidegen()
|
||||||
|
{
|
||||||
|
# Always use the prebuilt version.
|
||||||
|
local host_os_arch=$(get_build_var HOST_PREBUILT_TAG)
|
||||||
|
case $host_os_arch in
|
||||||
|
linux-x86) "$(gettop)"/prebuilts/asuite/aidegen/linux-x86/aidegen "$@"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "aidegen is not supported on your host arch: $host_os_arch"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
# Execute the contents of any vendorsetup.sh files we can find.
|
# Execute the contents of any vendorsetup.sh files we can find.
|
||||||
function source_vendorsetup() {
|
function source_vendorsetup() {
|
||||||
for dir in device vendor product; do
|
for dir in device vendor product; do
|
||||||
|
|
Loading…
Reference in a new issue