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

Merge changes from topic "rm_ONE_SHOT_MAKEFILE"

Browse Source 
* changes:
  Remove [jni_]link_type files
  Remove support for ONE_SHOT_MAKEFILE
This commit is contained in:
Dan Willemsen
2019-08-01 21:11:02 +00:00
committed by Gerrit Code Review
parent 8d8e3d6157 0df0f6bbf1
commit 8b8b9b6bf8
9 changed files with 14 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,10 +24,6 @@ $(MODULE_INFO_JSON):
$(hide) echo '}' >> $@
# If ONE_SHOT_MAKEFILE is set, our view of the world is smaller, so don't
# rewrite the file in that came.
ifndef ONE_SHOT_MAKEFILE
droidcore: $(MODULE_INFO_JSON)
endif
$(call dist-for-goals, general-tests, $(MODULE_INFO_JSON))

4
core/tasks/sdk-addon.mk
View File

@@ -14,8 +14,6 @@
.PHONY: sdk_addon
ifndef ONE_SHOT_MAKEFILE
# If they didn't define PRODUCT_SDK_ADDON_NAME, then we won't define
# any of these rules.
addon_name := $(PRODUCT_SDK_ADDON_NAME)
@@ -150,5 +148,3 @@ ifneq ($(filter sdk_addon,$(MAKECMDGOALS)),)
$(error Trying to build sdk_addon, but product '$(INTERNAL_PRODUCT)' does not define one)
endif
endif # addon_name
endif # !ONE_SHOT_MAKEFILE