Convert vtsc's Android.mk to Android.bp

* Converted Android.mk->Android.bp for all the dependent targets.

TODO: Covert all Android.mk under vts to Android.bp.
Bug: 31930023

Test: make vts
Change-Id: Ic7dcee6746b0309c140c1cf610a901c465215330

7 files changed, 238 insertions, 219 deletions

diff --git a/sysfuzzer/Android.bp b/sysfuzzer/Android.bp
new file mode 100644
index 000000000..1cf2edfb8
--- /dev/null
+++ b/sysfuzzer/Android.bp
@@ -0,0 +1,24 @@
+//
+// Copyright (C) 2016 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.
+//
+
+subdirs = [
+     "common",
+     "framework",
+     "libcodecoverage",
+     "libdatatype",
+     "libmeasurement",
+     "vtscompiler",
+]
diff --git a/sysfuzzer/common/Android.bp b/sysfuzzer/common/Android.bp
new file mode 100644
index 000000000..5c4f2154d
--- /dev/null
+++ b/sysfuzzer/common/Android.bp
@@ -0,0 +1,103 @@
+//
+// Copyright (C) 2016 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.
+//
+
+cc_library_shared {
+
+    name: "libvts_common",
+    tags: ["optional"],
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+
+    srcs: [
+        "binder/VtsFuzzerBinderService.cpp",
+        "component_loader/DllLoader.cpp",
+        "fuzz_tester/FuzzerBase.cpp",
+        "fuzz_tester/FuzzerCallbackBase.cpp",
+        "fuzz_tester/FuzzerWrapper.cpp",
+        "specification_parser/InterfaceSpecificationParser.cpp",
+        "specification_parser/SpecificationBuilder.cpp",
+        "utils/InterfaceSpecUtil.cpp",
+        "utils/StringUtil.cpp",
+    ],
+
+    include_dirs: [
+        "bionic",
+        "external/protobuf/src",
+        "frameworks/native/include",
+        "libcore",
+        "system/core/include",
+        "system/extras",
+        "test/vts/drivers/libdrivercomm",
+        "test/vts/sysfuzzer/libcodecoverage",
+        
+    ],
+    local_include_dirs: ["include"],
+
+    shared_libs: [
+        "libbinder",
+        "libcutils",
+        "libdl",
+        "liblog",
+        "libprotobuf-cpp-full",
+        "libutils",
+        "libvts_drivercomm",
+        "libvts_codecoverage",
+        "libvts_multidevice_proto",
+        
+    ],
+
+    compile_multilib: "both",
+
+    export_include_dirs: ["include"],
+
+}
+
+cc_library_host_shared {
+
+    name: "libvts_common_host",
+    tags: ["optional"],
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+
+    // Files needed for VTSC.
+    srcs: [
+        "specification_parser/InterfaceSpecificationParser.cpp",
+        "utils/InterfaceSpecUtil.cpp",
+        "utils/StringUtil.cpp",
+    ],
+
+    include_dirs: [
+        "bionic",
+        "external/protobuf/src",
+        "libcore",
+        "system/extras",
+    ],
+    local_include_dirs: ["include"],
+
+    shared_libs: [
+        "libprotobuf-cpp-full",
+        "libvts_multidevice_proto_host",
+    ],
+
+    export_include_dirs: ["include"],
+
+}
diff --git a/sysfuzzer/common/Android.mk b/sysfuzzer/common/Android.mk
deleted file mode 100644
index 0a2e30d53..000000000
--- a/sysfuzzer/common/Android.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# Copyright (C) 2016 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)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libvts_common
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_CFLAGS += -Wall -Werror
-
-LOCAL_SRC_FILES := \
-  binder/VtsFuzzerBinderService.cpp \
-  component_loader/DllLoader.cpp \
-  fuzz_tester/FuzzerBase.cpp \
-  fuzz_tester/FuzzerCallbackBase.cpp \
-  fuzz_tester/FuzzerWrapper.cpp \
-  specification_parser/InterfaceSpecificationParser.cpp \
-  specification_parser/SpecificationBuilder.cpp \
-  utils/InterfaceSpecUtil.cpp \
-  utils/StringUtil.cpp \
-
-LOCAL_C_INCLUDES := \
-  $(LOCAL_PATH)/include \
-  bionic \
-  libcore \
-  system/extras \
-  external/protobuf/src \
-  frameworks/native/include \
-  test/vts/drivers/libdrivercomm \
-  test/vts/sysfuzzer/libcodecoverage \
-  system/core/include \
-
-LOCAL_SHARED_LIBRARIES := \
-  libutils \
-  libcutils \
-  libbinder \
-  liblog \
-  libdl \
-  libandroid_runtime \
-  libvts_drivercomm \
-  libvts_codecoverage \
-  libvts_multidevice_proto \
-  libprotobuf-cpp-full \
-
-LOCAL_MULTILIB := both
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-  $(LOCAL_PATH)/include \
-
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libvts_common_host
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_HOST_OS := darwin linux
-
-LOCAL_CFLAGS += -Wall -Werror
-
-# Files needed for VTSC.
-LOCAL_SRC_FILES := \
-  specification_parser/InterfaceSpecificationParser.cpp \
-  utils/InterfaceSpecUtil.cpp \
-  utils/StringUtil.cpp \
-
-LOCAL_C_INCLUDES := \
-  $(LOCAL_PATH)/include \
-  bionic \
-  libcore \
-  system/extras \
-  external/protobuf/src \
-
-LOCAL_SHARED_LIBRARIES := \
-  libprotobuf-cpp-full \
-  libvts_multidevice_proto_host \
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-  $(LOCAL_PATH)/include \
-
-include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/sysfuzzer/libcodecoverage/Android.bp b/sysfuzzer/libcodecoverage/Android.bp
new file mode 100644
index 000000000..976beb60b
--- /dev/null
+++ b/sysfuzzer/libcodecoverage/Android.bp
@@ -0,0 +1,33 @@
+//
+// Copyright (C) 2016 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.
+//
+
+cc_library_shared {
+
+    name: "libvts_codecoverage",
+    tags: ["optional"],
+
+    srcs: [
+        "gcda_parser.cpp",
+        "gcov_basic_io.cpp",
+    ],
+
+    include_dirs: [
+        "bionic",
+        "libcore",
+    ],
+
+    shared_libs: ["libcutils"],
+}
diff --git a/sysfuzzer/libcodecoverage/Android.mk b/sysfuzzer/libcodecoverage/Android.mk
deleted file mode 100644
index ec0da7fb4..000000000
--- a/sysfuzzer/libcodecoverage/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (C) 2016 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)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libvts_codecoverage
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := \
-  gcda_parser.cpp \
-  gcov_basic_io.cpp \
-
-LOCAL_C_INCLUDES := \
-  bionic \
-  libcore \
-
-LOCAL_SHARED_LIBRARIES := \
-  libcutils \
-
-LOCAL_MULTILIB := both
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/sysfuzzer/vtscompiler/Android.bp b/sysfuzzer/vtscompiler/Android.bp
new file mode 100644
index 000000000..8deb542d8
--- /dev/null
+++ b/sysfuzzer/vtscompiler/Android.bp
@@ -0,0 +1,78 @@
+//
+// Copyright (C) 2016 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.
+//
+
+subdirs = [
+     "code_gen",
+     "test",
+]
+
+cc_library_host_shared {
+
+    name: "libvtsc",
+
+    srcs: [
+        "VtsCompilerUtils.cpp",
+        "code_gen/CodeGenBase.cpp",
+        "code_gen/driver/DriverCodeGenBase.cpp",
+        "code_gen/driver/HalCodeGen.cpp",
+        "code_gen/driver/HalSubmoduleCodeGen.cpp",
+        "code_gen/driver/HalHidlCodeGen.cpp",
+        "code_gen/driver/LegacyHalCodeGen.cpp",
+        "code_gen/driver/LibSharedCodeGen.cpp",
+        "code_gen/profiler/ProfilerCodeGenBase.cpp",
+        "code_gen/profiler/HalHidlProfilerCodeGen.cpp",
+    ],
+
+    include_dirs: ["test/vts/sysfuzzer/common"],
+
+    static_libs: ["libz"],
+
+    shared_libs: [
+        "libbase",
+        "libhidl-gen-utils",
+        "libprotobuf-cpp-full",
+        "libvts_common_host",
+        "libvts_multidevice_proto_host",
+    ],
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+
+}
+
+cc_binary_host {
+
+    name: "vtsc",
+
+    srcs: ["VtsCompilerMain.cpp"],
+
+    include_dirs: ["test/vts/sysfuzzer/common"],
+
+    static_libs: ["libz"],
+
+    shared_libs: [
+        "libvts_multidevice_proto_host",
+        "libvtsc",
+    ],
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+
+}
\ No newline at end of file
diff --git a/sysfuzzer/vtscompiler/Android.mk b/sysfuzzer/vtscompiler/Android.mk
deleted file mode 100644
index 0c7c02c8e..000000000
--- a/sysfuzzer/vtscompiler/Android.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# Copyright (C) 2016 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)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libvtsc
-LOCAL_MODULE_HOST_OS := darwin linux
-
-LOCAL_CPP_EXTENSION := .cpp
-LOCAL_SRC_FILES := \
-  VtsCompilerUtils.cpp \
-  code_gen/CodeGenBase.cpp \
-  code_gen/driver/DriverCodeGenBase.cpp \
-  code_gen/driver/HalCodeGen.cpp \
-  code_gen/driver/HalSubmoduleCodeGen.cpp \
-  code_gen/driver/HalHidlCodeGen.cpp \
-  code_gen/driver/LegacyHalCodeGen.cpp \
-  code_gen/driver/LibSharedCodeGen.cpp \
-  code_gen/profiler/ProfilerCodeGenBase.cpp \
-  code_gen/profiler/HalHidlProfilerCodeGen.cpp \
-
-LOCAL_C_INCLUDES := \
-  $(LOCAL_PATH)/android \
-  $(LOCAL_PATH)/src \
-  test/vts/sysfuzzer/common \
-
-LOCAL_STATIC_LIBRARIES += \
-  libz \
-
-LOCAL_SHARED_LIBRARIES := \
-  libprotobuf-cpp-full \
-  libvts_common_host \
-  libvts_multidevice_proto_host \
-  libhidl-gen-utils \
-  libbase \
-
-LOCAL_CFLAGS := -Wall -Werror
-
-include $(BUILD_HOST_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vtsc
-LOCAL_MODULE_HOST_OS := darwin linux
-
-LOCAL_CPP_EXTENSION := .cpp
-LOCAL_SRC_FILES := \
-  VtsCompilerMain.cpp \
-
-LOCAL_C_INCLUDES := \
-  $(LOCAL_PATH)/android \
-  $(LOCAL_PATH)/src \
-  test/vts/sysfuzzer/common \
-
-LOCAL_STATIC_LIBRARIES += \
-  libz \
-
-LOCAL_SHARED_LIBRARIES := \
-  libprotobuf-cpp-full \
-  libvts_common_host \
-  libvts_multidevice_proto_host \
-  libhidl-gen-utils \
-  libbase \
-  libvtsc \
-
-LOCAL_CFLAGS := -Wall -Werror
-
-include $(BUILD_HOST_EXECUTABLE)
-
-$(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE))
-
-include $(call all-makefiles-under,$(LOCAL_PATH))