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

Merge "Mark BOARD_HAL_STATIC_LIBRARIES as obsolete."

Browse Source 
am: dc0b50b2d5

Change-Id: Ic34cfb12354d300015857f6d1b97ad020ee2f351
This commit is contained in:
Yifan Hong
2019-12-05 12:20:15 -08:00
committed by android-build-merger
parent 69c48374cc dc0b50b2d5
commit ef44906018
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Changes.md
View File

@@ -1,5 +1,17 @@
# Build System Changes for Android.mk Writers # Build System Changes for Android.mk Writers
# `BOARD_HAL_STATIC_LIBRARIES` and `LOCAL_HAL_STATIC_LIBRARIES` are obsolete {#BOARD_HAL_STATIC_LIBRARIES}
Define proper HIDL / Stable AIDL HAL instead.
* For libhealthd, use health HAL. See instructions for implementing
health HAL:
* [hardware/interfaces/health/2.1/README.md] for health 2.1 HAL (recommended)
* [hardware/interfaces/health/1.0/README.md] for health 1.0 HAL
* For libdumpstate, use at least Dumpstate HAL 1.0.
## PRODUCT_STATIC_BOOT_CONTROL_HAL is obsolete {#PRODUCT_STATIC_BOOT_CONTROL_HAL} ## PRODUCT_STATIC_BOOT_CONTROL_HAL is obsolete {#PRODUCT_STATIC_BOOT_CONTROL_HAL}
`PRODUCT_STATIC_BOOT_CONTROL_HAL` was the workaround to allow sideloading with `PRODUCT_STATIC_BOOT_CONTROL_HAL` was the workaround to allow sideloading with
@@ -480,3 +492,5 @@ version.
[external/fonttools/Lib/fontTools/Android.bp]: https://android.googlesource.com/platform/external/fonttools/+/master/Lib/fontTools/Android.bp [external/fonttools/Lib/fontTools/Android.bp]: https://android.googlesource.com/platform/external/fonttools/+/master/Lib/fontTools/Android.bp
[frameworks/base/Android.bp]: https://android.googlesource.com/platform/frameworks/base/+/master/Android.bp [frameworks/base/Android.bp]: https://android.googlesource.com/platform/frameworks/base/+/master/Android.bp
[frameworks/base/data/fonts/Android.mk]: https://android.googlesource.com/platform/frameworks/base/+/master/data/fonts/Android.mk [frameworks/base/data/fonts/Android.mk]: https://android.googlesource.com/platform/frameworks/base/+/master/data/fonts/Android.mk
[hardware/interfaces/health/1.0/README.md]: https://android.googlesource.com/platform/hardware/interfaces/+/master/health/1.0/README.md
[hardware/interfaces/health/2.1/README.md]: https://android.googlesource.com/platform/hardware/interfaces/+/master/health/2.1/README.md

9
core/binary.mk
View File

@@ -435,15 +435,6 @@ my_header_libraries := $(LOCAL_HEADER_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_V
include $(BUILD_SYSTEM)/cxx_stl_setup.mk include $(BUILD_SYSTEM)/cxx_stl_setup.mk
# Add static HAL libraries
ifdef LOCAL_HAL_STATIC_LIBRARIES
$(foreach lib, $(LOCAL_HAL_STATIC_LIBRARIES), \
$(eval b_lib := $(filter $(lib).%,$(BOARD_HAL_STATIC_LIBRARIES)))\
$(if $(b_lib), $(eval my_static_libraries += $(b_lib)),\
$(eval my_static_libraries += $(lib).default)))
b_lib :=
endif
ifneq ($(strip $(CUSTOM_$(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)LINKER)),) ifneq ($(strip $(CUSTOM_$(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)LINKER)),)
my_linker := $(CUSTOM_$(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)LINKER) my_linker := $(CUSTOM_$(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)LINKER)
else else

1
core/clear_vars.mk
View File

@@ -112,7 +112,6 @@ LOCAL_GENERATED_SOURCES:=
# Group static libraries with "-Wl,--start-group" and "-Wl,--end-group" when linking. # Group static libraries with "-Wl,--start-group" and "-Wl,--end-group" when linking.
LOCAL_GROUP_STATIC_LIBRARIES:= LOCAL_GROUP_STATIC_LIBRARIES:=
LOCAL_GTEST:=true LOCAL_GTEST:=true
LOCAL_HAL_STATIC_LIBRARIES:=
LOCAL_HEADER_LIBRARIES:= LOCAL_HEADER_LIBRARIES:=
LOCAL_HOST_PREFIX:= LOCAL_HOST_PREFIX:=
LOCAL_HOST_REQUIRED_MODULES:= LOCAL_HOST_REQUIRED_MODULES:=

2
core/config.mk
View File

@@ -120,6 +120,8 @@ $(KATI_obsolete_var \
) )
$(KATI_obsolete_var PRODUCT_IOT) $(KATI_obsolete_var PRODUCT_IOT)
$(KATI_obsolete_var MD5SUM) $(KATI_obsolete_var MD5SUM)
$(KATI_obsolete_var BOARD_HAL_STATIC_LIBRARIES, See $(CHANGES_URL)#BOARD_HAL_STATIC_LIBRARIES)
$(KATI_obsolete_var LOCAL_HAL_STATIC_LIBRARIES, See $(CHANGES_URL)#BOARD_HAL_STATIC_LIBRARIES)
# Used to force goals to build. Only use for conditionally defined goals. # Used to force goals to build. Only use for conditionally defined goals.
.PHONY: FORCE .PHONY: FORCE