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

Merge "Stop disting monolithic SDK for Mac SDK builds"

Browse Source
This commit is contained in:
Treehugger Robot
2021-09-17 05:55:47 +00:00
committed by Gerrit Code Review
parent dfc9d7912f 616e7fd9b6
commit 1646ba0814
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/Makefile
View File

@@ -163,7 +163,9 @@ ndk-docs: $(ndk_doxygen_out)/index.html
.PHONY: ndk-docs .PHONY: ndk-docs
endif endif
ifeq ($(HOST_OS),linux)
$(call dist-for-goals,sdk,$(API_FINGERPRINT)) $(call dist-for-goals,sdk,$(API_FINGERPRINT))
endif
INSTALLED_RECOVERYIMAGE_TARGET := INSTALLED_RECOVERYIMAGE_TARGET :=
# Build recovery image if # Build recovery image if
@@ -775,7 +777,9 @@ $(INSTALLED_FILES_FILE_ROOT) : $(INTERNAL_ROOT_FILES) $(FILESLIST) $(FILESLIST_U
$(FILESLIST) $(TARGET_ROOT_OUT) > $(@:.txt=.json) $(FILESLIST) $(TARGET_ROOT_OUT) > $(@:.txt=.json)
$(FILESLIST_UTIL) -c $(@:.txt=.json) > $@ $(FILESLIST_UTIL) -c $(@:.txt=.json) > $@
ifeq ($(HOST_OS),linux)
$(call dist-for-goals, sdk win_sdk sdk_addon, $(INSTALLED_FILES_FILE_ROOT)) $(call dist-for-goals, sdk win_sdk sdk_addon, $(INSTALLED_FILES_FILE_ROOT))
endif
#------------------------------------------------------------------ #------------------------------------------------------------------
# dtb # dtb
@@ -805,7 +809,9 @@ $(INSTALLED_FILES_FILE_RAMDISK) : $(INTERNAL_RAMDISK_FILES) $(FILESLIST) $(FILES
$(FILESLIST) $(TARGET_RAMDISK_OUT) > $(@:.txt=.json) $(FILESLIST) $(TARGET_RAMDISK_OUT) > $(@:.txt=.json)
$(FILESLIST_UTIL) -c $(@:.txt=.json) > $@ $(FILESLIST_UTIL) -c $(@:.txt=.json) > $@
ifeq ($(HOST_OS),linux)
$(call dist-for-goals, sdk win_sdk sdk_addon, $(INSTALLED_FILES_FILE_RAMDISK)) $(call dist-for-goals, sdk win_sdk sdk_addon, $(INSTALLED_FILES_FILE_RAMDISK))
endif
BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img
ifeq ($(BOARD_RAMDISK_USE_LZ4),true) ifeq ($(BOARD_RAMDISK_USE_LZ4),true)
@@ -2808,7 +2814,9 @@ $(INSTALLED_FILES_FILE): $(FULL_SYSTEMIMAGE_DEPS) $(FILESLIST) $(FILESLIST_UTIL)
.PHONY: installed-file-list .PHONY: installed-file-list
installed-file-list: $(INSTALLED_FILES_FILE) installed-file-list: $(INSTALLED_FILES_FILE)
ifeq ($(HOST_OS),linux)
$(call dist-for-goals, sdk win_sdk sdk_addon, $(INSTALLED_FILES_FILE)) $(call dist-for-goals, sdk win_sdk sdk_addon, $(INSTALLED_FILES_FILE))
endif
systemimage_intermediates := \ systemimage_intermediates := \
$(call intermediates-dir-for,PACKAGING,systemimage) $(call intermediates-dir-for,PACKAGING,systemimage)
@@ -5375,7 +5383,9 @@ $(NDK_SYSROOT_TARGET): $(SOONG_OUT_DIR)/ndk.timestamp
@echo Package NDK sysroot... @echo Package NDK sysroot...
$(hide) tar cjf $@ -C $(SOONG_OUT_DIR) ndk $(hide) tar cjf $@ -C $(SOONG_OUT_DIR) ndk
ifeq ($(HOST_OS),linux)
$(call dist-for-goals,sdk,$(NDK_SYSROOT_TARGET)) $(call dist-for-goals,sdk,$(NDK_SYSROOT_TARGET))
endif
ifeq ($(build_ota_package),true) ifeq ($(build_ota_package),true)
# ----------------------------------------------------------------- # -----------------------------------------------------------------

2
core/main.mk
View File

@@ -1913,6 +1913,7 @@ endif # TARGET_BUILD_UNBUNDLED == TARGET_BUILD_UNBUNDLED_IMAGE
docs: $(ALL_DOCS) docs: $(ALL_DOCS)
.PHONY: sdk win_sdk winsdk-tools sdk_addon .PHONY: sdk win_sdk winsdk-tools sdk_addon
ifeq ($(HOST_OS),linux)
ALL_SDK_TARGETS := $(INTERNAL_SDK_TARGET) ALL_SDK_TARGETS := $(INTERNAL_SDK_TARGET)
sdk: $(ALL_SDK_TARGETS) sdk: $(ALL_SDK_TARGETS)
$(call dist-for-goals,sdk win_sdk, \ $(call dist-for-goals,sdk win_sdk, \
@@ -1922,6 +1923,7 @@ $(call dist-for-goals,sdk win_sdk, \
$(APPCOMPAT_ZIP) \ $(APPCOMPAT_ZIP) \
$(INSTALLED_BUILD_PROP_TARGET) \ $(INSTALLED_BUILD_PROP_TARGET) \
) )
endif
# umbrella targets to assit engineers in verifying builds # umbrella targets to assit engineers in verifying builds
.PHONY: java native target host java-host java-target native-host native-target \ .PHONY: java native target host java-host java-target native-host native-target \