Merge "Convert Android.mk under system/extras/simpleperf to Android.bp" into mainHEADmastermain

2 files changed, 25 insertions, 43 deletions

diff --git a/simpleperf/Android.bp b/simpleperf/Android.bp
index 0b973685..96e84746 100644
--- a/simpleperf/Android.bp
+++ b/simpleperf/Android.bp
@@ -780,3 +780,28 @@ cc_fuzz {
         },
     },
 }
+
+genrule {
+    name: "simpleperf_script.zip",
+    tools: [
+        "soong_zip",
+    ],
+    srcs: [
+        "**/*.proto",
+        "app_api/**/*",
+        "doc/**/*",
+        "demo/**/*",
+        "runtest/**/*",
+        "scripts/**/*",
+        "testdata/**/*",
+    ],
+    cmd: "$(location soong_zip) -o $(out) -C system/extras/simpleperf " +
+        "-D system/extras/simpleperf ",
+    out: [
+        "simpleperf/simpleperf_script.zip",
+    ],
+    dist: {
+        targets: ["simpleperf"],
+        dir: "simpleperf",
+    },
+}
diff --git a/simpleperf/Android.mk b/simpleperf/Android.mk
deleted file mode 100644
index 5c443e90..00000000
--- a/simpleperf/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (C) 2015 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.
-#
-LOCAL_PATH := $(call my-dir)
-
-# simpleperf_script.zip (for release in ndk)
-# ============================================================
-SIMPLEPERF_SCRIPT_FILE_LIST := \
-    $(call all-named-files-under,*.proto,.)
-
-SIMPLEPERF_SCRIPT_DIR_LIST := \
-    app_api \
-    doc \
-    demo \
-    runtest \
-    scripts \
-    testdata
-
-SIMPLEPERF_SCRIPT_FILE_LIST := $(addprefix -f $(LOCAL_PATH)/,$(SIMPLEPERF_SCRIPT_FILE_LIST))
-SIMPLEPERF_SCRIPT_DIR_LIST := $(addprefix -D $(LOCAL_PATH)/,$(SIMPLEPERF_SCRIPT_DIR_LIST))
-
-SIMPLEPERF_SCRIPT_PATH := \
-    $(call intermediates-dir-for,PACKAGING,simplerperf_script,HOST)/simpleperf_script.zip
-
-$(SIMPLEPERF_SCRIPT_PATH) : $(SOONG_ZIP)
-	$(hide) $(SOONG_ZIP) -d -o $@ -C system/extras/simpleperf $(SIMPLEPERF_SCRIPT_FILE_LIST) \
-    $(SIMPLEPERF_SCRIPT_DIR_LIST)
-
-$(call declare-1p-target,$(SIMPLEPERF_SCRIPT_PATH),system/extras)
-
-$(call dist-for-goals,simpleperf,$(SIMPLEPERF_SCRIPT_PATH):simpleperf/simpleperf_script.zip)