Snap for 4539010 from d7bfaea62b07d1f6104d2ccad445e2b084b6e946 to pi-release (7ae57251) · Commits · e / os / android_system_core

libcutils/include/private/android_filesystem_config.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -123,6 +123,8 @@
		#define AID_LOWPAN 1063 /* LoWPAN subsystem */
		#define AID_HSM 1064 /* hardware security module subsystem */
		#define AID_RESERVED_DISK 1065 /* GID that has access to reserved disk space */
		#define AID_STATSD 1066 /* statsd daemon */
		#define AID_INCIDENTD 1067 /* incidentd daemon */
		/* Changes to this file must be made in AOSP, not in internal branches. */

		#define AID_SHELL 2000 /* adb and debug shell user */

liblog/Android.bp

+0 −4

Original line number	Diff line number	Diff line
		@@ -80,10 +80,6 @@ cc_library {
		address: false,
		},
		},
		android_arm: {
		// TODO: This is to work around b/24465209. Remove after root cause is fixed
		ldflags: ["-Wl,--hash-style=both"],
		},
		windows: {
		srcs: ["uio.c"],
		enabled: true,

rootdir/Android.mk

+9 −11

Original line number	Diff line number	Diff line
		@@ -125,14 +125,12 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/init.environ.rc.in $(bcp_dep)
		bcp_md5 :=
		bcp_dep :=

		# If PLATFORM_VNDK_VERSION is defined and not "current", generate versioned
		# module names for ld.config.txt, llndk.libraries.txt and vndksp.libraries.txt
		# files.
		define versioned_module_name
		# If BOARD_VNDK_VERSION is defined, append PLATFORM_VNDK_VERSION to base name.
		define append_vndk_version
		$(strip \
		$(if $(filter-out current,$(PLATFORM_VNDK_VERSION)), \
		$(basename $(LOCAL_MODULE)).$(PLATFORM_VNDK_VERSION)$(suffix $(LOCAL_MODULE)), \
		$(LOCAL_MODULE) \
		$(if $(BOARD_VNDK_VERSION), \
		$(basename $(1)).$(PLATFORM_VNDK_VERSION)$(suffix $(1)), \
		$(1) \
		) \
		)
		endef
		@@ -153,7 +151,7 @@ ifeq ($(_enforce_vndk_at_runtime),true)
		LOCAL_MODULE := ld.config.txt
		LOCAL_MODULE_CLASS := ETC
		LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
		LOCAL_MODULE_STEM := $(call versioned_module_name)
		LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE))
		include $(BUILD_SYSTEM)/base_rules.mk

		llndk_libraries := $(call normalize-path-list,$(addsuffix .so,\
		@@ -200,7 +198,7 @@ else # if _enforce_vndk_at_runtime is not true
		LOCAL_MODULE := ld.config.txt
		ifeq ($(PRODUCT_TREBLE_LINKER_NAMESPACES)\|$(SANITIZE_TARGET),true\|)
		LOCAL_SRC_FILES := etc/ld.config.txt
		LOCAL_MODULE_STEM := $(call versioned_module_name)
		LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE))
		else
		LOCAL_SRC_FILES := etc/ld.config.legacy.txt
		LOCAL_MODULE_STEM := $(LOCAL_MODULE)
		@@ -216,7 +214,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE := llndk.libraries.txt
		LOCAL_MODULE_CLASS := ETC
		LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
		LOCAL_MODULE_STEM := $(call versioned_module_name)
		LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE))
		include $(BUILD_SYSTEM)/base_rules.mk
		$(LOCAL_BUILT_MODULE): PRIVATE_LLNDK_LIBRARIES := $(LLNDK_LIBRARIES)
		$(LOCAL_BUILT_MODULE):
		@@ -232,7 +230,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE := vndksp.libraries.txt
		LOCAL_MODULE_CLASS := ETC
		LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
		LOCAL_MODULE_STEM := $(call versioned_module_name)
		LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE))
		include $(BUILD_SYSTEM)/base_rules.mk
		$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_SAMEPROCESS_LIBRARIES := $(VNDK_SAMEPROCESS_LIBRARIES)
		$(LOCAL_BUILT_MODULE):

shell_and_utilities/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ phony {
		"sh",
		"sh_vendor",
		"toolbox",
		"toolbox_vendor",
		"toybox",
		"toybox_vendor",
		],

toolbox/Android.bp

+15 −9

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@ cc_defaults {
		cc_library_static {
		name: "libtoolbox_dd",
		defaults: ["toolbox_defaults"],
		vendor_available: true,
		srcs: [
		"upstream-netbsd/bin/dd/args.c",
		"upstream-netbsd/bin/dd/conv.c",
		@@ -32,12 +33,6 @@ cc_library_static {
		],
		}

		genrule {
		name: "toolbox_tools",
		cmd: "echo '/* file generated automatically */' >$(out) && for t in toolbox dd getevent newfs_msdos; do echo \"TOOL($$t)\" >>$(out); done",
		out: ["tools.h"],
		}

		genrule {
		name: "toolbox_input_labels",
		tool_files: ["generate-input.h-labels.py"],
		@@ -46,8 +41,8 @@ genrule {
		out: ["input.h-labels.h"],
		}

		cc_binary {
		name: "toolbox",
		cc_defaults {
		name: "toolbox_binary_defaults",
		defaults: ["toolbox_defaults"],
		srcs: [
		"toolbox.c",
		@@ -55,7 +50,6 @@ cc_binary {
		"newfs_msdos.c",
		],
		generated_headers: [
		"toolbox_tools",
		"toolbox_input_labels",
		],
		whole_static_libs: ["libtoolbox_dd"],
		@@ -70,6 +64,18 @@ cc_binary {
		],
		}

		cc_binary {
		name: "toolbox",
		defaults: ["toolbox_binary_defaults"],
		}

		cc_binary {
		name: "toolbox_vendor",
		stem: "toolbox",
		vendor: true,
		defaults: ["toolbox_binary_defaults"],
		}

		// We only want 'r' on userdebug and eng builds.
		cc_binary {
		name: "r",