commit 120902971b855e9ef900d2dee36fe4574d6d89a9
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 10 03:22:00 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 10 03:22:00 2023 +0000
tree 2fc324d397c1d6d9afac4441f5e92b454cf960f9
parent d9098252c644b23556c28140ccab42d8ff7f6c8d
parent 2f0508686e1117ebb51641146cf0df2e72bae549

Merge "Only run GentleKill test as root"

fastboot/Android.bp

diff --git a/fastboot/Android.bp b/fastboot/Android.bp
index 9512e7e..f66b01d 100644
--- a/fastboot/Android.bp
+++ b/fastboot/Android.bp
@@ -391,6 +391,8 @@
             enabled: false,
         },
     },
+
+    test_suites: ["general-tests"],
 }
 
 cc_test_host {

fastboot/TEST_MAPPING

diff --git a/fastboot/TEST_MAPPING b/fastboot/TEST_MAPPING
new file mode 100644
index 0000000..10f3d82
--- /dev/null
+++ b/fastboot/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "fastboot_test"
+    }
+  ]
+}

libprocessgroup/cgroup_map.cpp

diff --git a/libprocessgroup/cgroup_map.cpp b/libprocessgroup/cgroup_map.cpp
index 468d796..ac369d2 100644
--- a/libprocessgroup/cgroup_map.cpp
+++ b/libprocessgroup/cgroup_map.cpp
@@ -229,8 +229,8 @@
         auto controller_count = ACgroupFile_getControllerCount();
         for (uint32_t i = 0; i < controller_count; ++i) {
             const ACgroupController* controller = ACgroupFile_getController(i);
-            if (ACgroupController_getFlags(controller) &
-                CGROUPRC_CONTROLLER_FLAG_NEEDS_ACTIVATION) {
+            const uint32_t flags = ACgroupController_getFlags(controller);
+            if (flags & CGROUPRC_CONTROLLER_FLAG_NEEDS_ACTIVATION) {
                 std::string str("+");
                 str.append(ACgroupController_getName(controller));
                 if (!WriteStringToFile(str, path + "/cgroup.subtree_control")) {

rootdir/Android.mk

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 3dd269a..3362872 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -222,6 +222,8 @@
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 LOCAL_MODULE_PATH := $(PRODUCT_OUT)
 
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
 include $(BUILD_PREBUILT)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))