Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/build into aosp-merge (747461c1) · Commits · e / os / android_build

core/build_id.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,4 +19,4 @@
		# (like "CRB01"). It must be a single word, and is
		# capitalized by convention.

		export BUILD_ID=JRO03R
		export BUILD_ID=JZO54K

+1 −0

Original line number	Diff line number	Diff line
		@@ -123,6 +123,7 @@ LOCAL_CTS_TEST_RUNNER:=
		LOCAL_CLANG:=
		LOCAL_ADDRESS_SANITIZER:=
		LOCAL_JAR_EXCLUDE_FILES:=
		LOCAL_SOURCE_FILES_ALL_GENERATED:= # '',true

		# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to
		# iterate over thousands of entries every time.

+6 −3

Original line number	Diff line number	Diff line
		@@ -15,8 +15,11 @@ endif #PDK

		# Make sure there's something to build.
		# It's possible to build a package that doesn't contain any classes.
		ifeq (,$(strip $(LOCAL_SRC_FILES)$(all_res_assets)$(LOCAL_STATIC_JAVA_LIBRARIES)))
		$(error $(LOCAL_PATH): Target java module does not define any source or resource files)
		# LOCAL_SOURCE_FILES_ALL_GENERATED is set only if the module does not have static source files,
		# but generated source files in its LOCAL_INTERMEDIATE_SOURCE_DIR.
		# You have to set up the dependency in some other way.
		ifeq (,$(strip $(LOCAL_SRC_FILES)$(all_res_assets)$(LOCAL_STATIC_JAVA_LIBRARIES))$(filter true,$(LOCAL_SOURCE_FILES_ALL_GENERATED)))
		$(warning $(LOCAL_PATH): Target java module does not define any source or resource files)
		endif

		LOCAL_NO_STANDARD_LIBRARIES:=$(strip $(LOCAL_NO_STANDARD_LIBRARIES))
		@@ -232,7 +235,7 @@ $(cleantarget): PRIVATE_CLEAN_FILES += $(intermediates.COMMON)
		# If the module includes java code (i.e., it's not framework-res), compile it.
		full_classes_jar :=
		built_dex :=
		ifneq (,$(strip $(all_java_sources)$(full_static_java_libs)))
		ifneq (,$(strip $(all_java_sources)$(full_static_java_libs))$(filter true,$(LOCAL_SOURCE_FILES_ALL_GENERATED)))

		# If LOCAL_BUILT_MODULE_STEM wasn't overridden by our caller,
		# full_classes_jar will be the same module as LOCAL_BUILT_MODULE.

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)"
		# which is the version that we reveal to the end user.
		# Update this value when the platform version changes (rather
		# than overriding it somewhere else). Can be an arbitrary string.
		PLATFORM_VERSION := 4.1.1
		PLATFORM_VERSION := 4.1.2
		endif

		ifeq "" "$(PLATFORM_SDK_VERSION)"

+0 −3

Original line number	Diff line number	Diff line
		@@ -29,9 +29,6 @@ BOARD_USES_GENERIC_AUDIO := true
		# no hardware camera
		USE_CAMERA_STUB := true

		# Set /system/bin/sh to ash, not mksh, to make sure we can switch back.
		TARGET_SHELL := ash

		# Enable dex-preoptimization to speed up the first boot sequence
		# of an SDK AVD. Note that this operation only works on Linux for now
		ifeq ($(HOST_OS),linux)