Merge "fix: wrong dependency from ETC to libc++.so" am: 86a3f0c6c0 am: f21e15515d am: 3a1f5a85bc (882d9a4b) · Commits · e / os / android_build

core/cc_prebuilt_internal.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,11 @@
		# Internal build rules for native prebuilt modules
		############################################################

		prebuilt_module_classes := STATIC_LIBRARIES SHARED_LIBRARIES EXECUTABLES NATIVE_TESTS
		ifeq ($(filter $(prebuilt_module_classes),$(LOCAL_MODULE_CLASS)),)
		$(call pretty-error,cc_prebuilt_internal.mk is for $(prebuilt_module_classes) modules only)
		endif

		my_strip_module := $(firstword \
		$(LOCAL_STRIP_MODULE_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) \
		$(LOCAL_STRIP_MODULE))

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		#
		# Copyright (C) 2019 The Android Open Source Project
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.
		# You may obtain a copy of the License at
		#
		# http://www.apache.org/licenses/LICENSE-2.0
		#
		# Unless required by applicable law or agreed to in writing, software
		# distributed under the License is distributed on an "AS IS" BASIS,
		# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		# See the License for the specific language governing permissions and
		# limitations under the License.
		#

		############################################################
		# Internal build rules for misc prebuilt modules that don't need additional processing
		############################################################

		prebuilt_module_classes := SCRIPT ETC DATA
		ifeq ($(filter $(prebuilt_module_classes),$(LOCAL_MODULE_CLASS)),)
		$(call pretty-error,misc_prebuilt_internal.mk is for $(prebuilt_module_classes) modules only)
		endif

		include $(BUILD_SYSTEM)/base_rules.mk

		$(LOCAL_BUILT_MODULE) : $(my_prebuilt_src_file)
		$(transform-prebuilt-to-target)

+5 −2

Original line number	Diff line number	Diff line
		@@ -49,9 +49,12 @@ ifeq (APPS,$(LOCAL_MODULE_CLASS))
		include $(BUILD_SYSTEM)/app_prebuilt_internal.mk
		else ifeq (JAVA_LIBRARIES,$(LOCAL_MODULE_CLASS))
		include $(BUILD_SYSTEM)/java_prebuilt_internal.mk
		else
		# TODO(jungjw): Check LOCAL_MODULE_CLASS value and generate an error for unexpected ones.
		else ifneq ($(filter STATIC_LIBRARIES SHARED_LIBRARIES EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
		include $(BUILD_SYSTEM)/cc_prebuilt_internal.mk
		else ifneq ($(filter SCRIPT ETC DATA,$(LOCAL_MODULE_CLASS)),)
		include $(BUILD_SYSTEM)/misc_prebuilt_internal.mk
		else
		$(error $(LOCAL_MODULE) : unexpected LOCAL_MODULE_CLASS for prebuilts: $(LOCAL_MODULE_CLASS))
		endif

		$(built_module) : $(LOCAL_ADDITIONAL_DEPENDENCIES)