StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make side of converting refreshmod to a shell script

Browse Source 
Bug: 340648588
Test: refreshmod
Change-Id: Iedbdd31f9a58cb609a826dfe8066c9eff8aa5904
This commit is contained in:
Joe Onorato
2024-05-17 12:18:24 -07:00
parent 1b9ab2903c
commit 143f9e0b72
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/tasks/module-info.mk
View File

@@ -52,6 +52,8 @@ $(MODULE_INFO_JSON): $(SOONG_MODULE_INFO)
$(PRIVATE_MERGE_JSON_OBJECTS) -o $@ $(PRIVATE_SOONG_MODULE_INFO) $@.tmp $(PRIVATE_MERGE_JSON_OBJECTS) -o $@ $(PRIVATE_SOONG_MODULE_INFO) $@.tmp
rm $@.tmp rm $@.tmp
.PHONY: module-info
module-info: $(MODULE_INFO_JSON)
droidcore-unbundled: $(MODULE_INFO_JSON) droidcore-unbundled: $(MODULE_INFO_JSON)

17
envsetup.sh
View File

@@ -1195,22 +1195,6 @@ function godir () {
\cd $T/$pathname \cd $T/$pathname
} }
function refreshmod() {
if [ ! "$ANDROID_PRODUCT_OUT" ]; then
echo "No ANDROID_PRODUCT_OUT. Try running 'lunch' first." >&2
return 1
fi
echo "Refreshing modules (building module-info.json). Log at $ANDROID_PRODUCT_OUT/module-info.json.build.log." >&2
# for the output of the next command
mkdir -p $ANDROID_PRODUCT_OUT || return 1
# Note, can't use absolute path because of the way make works.
m $(get_build_var PRODUCT_OUT)/module-info.json \
> $ANDROID_PRODUCT_OUT/module-info.json.build.log 2>&1
}
# Verifies that module-info.txt exists, returning nonzero if it doesn't. # Verifies that module-info.txt exists, returning nonzero if it doesn't.
function verifymodinfo() { function verifymodinfo() {
if [ ! "$ANDROID_PRODUCT_OUT" ]; then if [ ! "$ANDROID_PRODUCT_OUT" ]; then
@@ -1578,6 +1562,7 @@ unset sgrep
unset tomlgrep unset tomlgrep
unset treegrep unset treegrep
unset syswrite unset syswrite
unset refreshmod
validate_current_shell validate_current_shell