Convert most of tools/dexfuzz/Android.mk to .bp
Had to leave the .PHONY target as that depends on a build variable
that is populated in other .mk files.
The dexfuzz script prebuilt target had to be renamed to dexfuzz-script
as it conflicted with the previous dexfuzz.jar target. That does not
change the name of the script that is copied into the bin directory
though.
The instructions in the tools/dexfuzz/README did not seem to be
affected by this change.
Bug: 130204596
Bug: 122332855
Test: m fuzzer
Change-Id: Ic1dc9fcd1c7c66693f60bae87e5cde6496dff162
diff --git a/tools/dexfuzz/Android.bp b/tools/dexfuzz/Android.bp
new file mode 100644
index 0000000..b095e00
--- /dev/null
+++ b/tools/dexfuzz/Android.bp
@@ -0,0 +1,29 @@
+//
+// Copyright (C) 2014 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.
+//
+
+// --- dexfuzz.jar ----------------
+java_library_host {
+ name: "dexfuzz",
+ srcs: ["src/**/*.java"],
+ manifest: "manifest.txt",
+}
+
+// --- dexfuzz script ----------------
+sh_binary_host {
+ name: "dexfuzz-script",
+ src: "dexfuzz",
+ filename_from_src: true,
+}
diff --git a/tools/dexfuzz/Android.mk b/tools/dexfuzz/Android.mk
index 06d3f62..e316fad 100644
--- a/tools/dexfuzz/Android.mk
+++ b/tools/dexfuzz/Android.mk
@@ -16,22 +16,6 @@
LOCAL_PATH := $(call my-dir)
-# --- dexfuzz.jar ----------------
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAR_MANIFEST := manifest.txt
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE := dexfuzz
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-# --- dexfuzz script ----------------
-include $(CLEAR_VARS)
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE := dexfuzz
-LOCAL_SRC_FILES := dexfuzz
-include $(BUILD_PREBUILT)
-
# --- dexfuzz script with core image dependencies ----------------
.PHONY: fuzzer
-fuzzer: $(LOCAL_BUILT_MODULE) $(HOST_CORE_IMG_OUTS)
+fuzzer: dexfuzz-script $(HOST_CORE_IMG_OUTS)