Merge QP1A.181202.001

Change-Id: I054a21d0e91e54c890fa8b693905b5d74a47b4a3

CleanSpec.mk

+# Copyright (C) 2007 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.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list.  These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list.  E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# *****************************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THE BANNER
+# *****************************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+$(call add-clean-step, rm -rf $(TARGET_OUT_OPTIONAL_EXECUTABLES)/sanitizer-status)
+
+# ******************************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER
+# ******************************************************************

sanitizer-status/Android.bp

+cc_defaults {
+    name: "sanitizer-status_defaults",
+
+    c_std: "c11",
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-O0",
+    ],
+}
+
+sanitizer_status_library_shared {
+    name: "libsanitizer-status",
+    defaults: ["sanitizer-status_defaults"],
+
+    srcs: ["sanitizer-status.c"],
+}
+
+cc_binary {
+    name: "sanitizer-status",
+    defaults: ["sanitizer-status_defaults"],
+
+    srcs: ["main.c"],
+    shared_libs: ["libsanitizer-status"],
+}
+
+bootstrap_go_package {
+    name: "soong-sanitizer_status",
+    pkgPath: "android/soong/security/santizers_status",
+    deps: [
+        "blueprint",
+        "soong-android",
+        "soong-cc",
+    ],
+    srcs: ["sanitizer-status.go"],
+    pluginFor: ["soong_build"],
+}

sanitizer-status/Android.mk

-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS := -std=c11 -Wall -Werror -O0
-
-LOCAL_SRC_FILES:= sanitizer-status.c
-
-LOCAL_MODULE:= libsanitizer-status
-
-ifneq ($(filter address,$(SANITIZE_TARGET)),)
-LOCAL_CFLAGS += -DANDROID_SANITIZE_ADDRESS=1
-endif
-
-ifneq ($(filter coverage,$(SANITIZE_TARGET)),)
-LOCAL_CFLAGS += -DANDROID_SANITIZE_COVERAGE=1
-endif
-
-include $(BUILD_SHARED_LIBRARY)
-#==========================================================
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS := -std=c11 -Wall -Werror -O0
-
-LOCAL_SRC_FILES:= main.c
-
-LOCAL_MODULE:= sanitizer-status
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-
-LOCAL_SHARED_LIBRARIES += libsanitizer-status
-
-include $(BUILD_EXECUTABLE)

sanitizer-status/sanitizer-status.go

+package sanitizer_status
+
+import (
+	"android/soong/android"
+	"android/soong/cc"
+)
+
+func init() {
+	android.RegisterModuleType("sanitizer_status_library_shared",
+		libraryFactory)
+}
+
+func libraryFactory() android.Module {
+	module := cc.LibrarySharedFactory()
+	android.AddLoadHook(module, loadHook)
+	return module
+}
+
+func loadHook(ctx android.LoadHookContext) {
+	type props struct {
+		Cflags []string
+	}
+
+	p := &props{}
+
+	sanitizers := ctx.Config().SanitizeDevice()
+
+	if android.InList("address", sanitizers) {
+		p.Cflags = append(p.Cflags, "-DANDROID_SANITIZE_ADDRESS=1")
+	}
+	if android.InList("coverage", sanitizers) {
+		p.Cflags = append(p.Cflags, "-DANDROID_SANITIZE_COVERAGE=1")
+	}
+
+	ctx.AppendProperties(p)
+}