diff options
| -rw-r--r-- | core/cxx_stl_setup.mk | 10 | ||||
| -rw-r--r-- | core/soong_config.mk | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk index a2abb1a322..f71ef72f50 100644 --- a/core/cxx_stl_setup.mk +++ b/core/cxx_stl_setup.mk @@ -78,18 +78,12 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),) my_static_libraries += libc++demangle ifeq ($(my_link_type),static) - my_static_libraries += libm libc - ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) - my_static_libraries += libunwind_llvm - my_ldflags += -Wl,--exclude-libs,libunwind_llvm.a - else - my_static_libraries += libgcc_stripped - my_ldflags += -Wl,--exclude-libs,libgcc_stripped.a - endif + my_static_libraries += libm libc libunwind endif endif else ifeq ($(my_cxx_stl),ndk) # Using an NDK STL. Handled in binary.mk, except for the unwinder. + # TODO: Switch the NDK over to the LLVM unwinder for non-arm32 architectures. ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) my_static_libraries += libunwind_llvm my_ldflags += -Wl,--exclude-libs,libunwind_llvm.a diff --git a/core/soong_config.mk b/core/soong_config.mk index 5ca1d1073d..54e9698f09 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -147,6 +147,12 @@ $(call add_json_list, UpdatableBootJars, $(PRODUCT_UPDATABLE_BOO $(call add_json_bool, VndkUseCoreVariant, $(TARGET_VNDK_USE_CORE_VARIANT)) $(call add_json_bool, VndkSnapshotBuildArtifacts, $(VNDK_SNAPSHOT_BUILD_ARTIFACTS)) +$(call add_json_bool, DirectedVendorSnapshot, $(DIRECTED_VENDOR_SNAPSHOT)) +$(call add_json_map, VendorSnapshotModules) +$(foreach module,$(VENDOR_SNAPSHOT_MODULES),\ + $(call add_json_bool,$(module),true)) +$(call end_json_map) + $(call add_json_bool, Treble_linker_namespaces, $(filter true,$(PRODUCT_TREBLE_LINKER_NAMESPACES))) $(call add_json_bool, Enforce_vintf_manifest, $(filter true,$(PRODUCT_ENFORCE_VINTF_MANIFEST))) |