diff options
author | Dan Willemsen <dwillemsen@google.com> | 2018-11-19 18:24:58 -0800 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2019-05-11 01:47:07 +0000 |
commit | 04907fdfca9090ecbe2cbb5b564a63954b5a5fdf (patch) | |
tree | e946c3a03a45fc89d6ce706f81cda46541d608d2 | |
parent | 1c4634f61047330bef41952e6f3908499b3f7cc1 (diff) | |
download | sdk-04907fdfca9090ecbe2cbb5b564a63954b5a5fdf.tar.gz |
Convert to Android.bp
See build/soong/README.md for more information.
Bug: 122333025
Test: cd sdk; mma
Change-Id: Ia74dd04d0cd97aea4374d4e0b8461d3e50d1ac9e
-rw-r--r-- | annotations/Android.bp | 22 | ||||
-rw-r--r-- | annotations/Android.mk | 26 | ||||
-rw-r--r-- | dumpeventlog/Android.bp | 12 | ||||
-rw-r--r-- | dumpeventlog/Android.mk | 5 | ||||
-rw-r--r-- | dumpeventlog/etc/Android.mk | 8 | ||||
-rw-r--r-- | dumpeventlog/etc/manifest.txt | 1 | ||||
-rw-r--r-- | dumpeventlog/src/Android.mk | 13 | ||||
-rw-r--r-- | eventanalyzer/Android.bp | 25 | ||||
-rw-r--r-- | eventanalyzer/Android.mk | 18 | ||||
-rw-r--r-- | eventanalyzer/etc/Android.mk | 21 | ||||
-rw-r--r-- | eventanalyzer/etc/manifest.txt | 1 | ||||
-rw-r--r-- | eventanalyzer/src/Android.mk | 26 | ||||
-rw-r--r-- | hierarchyviewer/Android.bp | 27 | ||||
-rw-r--r-- | hierarchyviewer/etc/Android.bp | 18 | ||||
-rw-r--r-- | hierarchyviewer/etc/Android.mk | 19 | ||||
-rw-r--r-- | hierarchyviewer/src/Android.mk | 28 |
16 files changed, 104 insertions, 166 deletions
diff --git a/annotations/Android.bp b/annotations/Android.bp new file mode 100644 index 000000000..35a0d58fa --- /dev/null +++ b/annotations/Android.bp @@ -0,0 +1,22 @@ +// +// Copyright (C) 2008 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. +// + +java_library_host { + name: "annotations", + + srcs: ["src/**/*.java"], + java_resource_dirs: ["src"], +} diff --git a/annotations/Android.mk b/annotations/Android.mk deleted file mode 100644 index cbfe92d95..000000000 --- a/annotations/Android.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright (C) 2008 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_SRC_FILES := $(call all-java-files-under, src) -LOCAL_JAVA_RESOURCE_DIRS := src - -LOCAL_MODULE := annotations -LOCAL_MODULE_TAGS := optional - -include $(BUILD_HOST_JAVA_LIBRARY) - diff --git a/dumpeventlog/Android.bp b/dumpeventlog/Android.bp new file mode 100644 index 000000000..618446f83 --- /dev/null +++ b/dumpeventlog/Android.bp @@ -0,0 +1,12 @@ +// Copyright 2007 The Android Open Source Project +// + +java_binary_host { + name: "dumpeventlog", + + srcs: ["src/**/*.java"], + + wrapper: "etc/dumpeventlog", + main_class: "com.android.dumpeventlog.DumpEventLog", + libs: ["ddmlib-prebuilt"], +} diff --git a/dumpeventlog/Android.mk b/dumpeventlog/Android.mk deleted file mode 100644 index 7bb870dee..000000000 --- a/dumpeventlog/Android.mk +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2007 The Android Open Source Project -# -DUMPEVENTLOG_LOCAL_DIR := $(call my-dir) -include $(DUMPEVENTLOG_LOCAL_DIR)/etc/Android.mk -include $(DUMPEVENTLOG_LOCAL_DIR)/src/Android.mk diff --git a/dumpeventlog/etc/Android.mk b/dumpeventlog/etc/Android.mk deleted file mode 100644 index 80947346f..000000000 --- a/dumpeventlog/etc/Android.mk +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 2007 The Android Open Source Project -# -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_PREBUILT_EXECUTABLES := dumpeventlog -include $(BUILD_HOST_PREBUILT) - diff --git a/dumpeventlog/etc/manifest.txt b/dumpeventlog/etc/manifest.txt deleted file mode 100644 index 0eea91537..000000000 --- a/dumpeventlog/etc/manifest.txt +++ /dev/null @@ -1 +0,0 @@ -Main-Class: com.android.dumpeventlog.DumpEventLog diff --git a/dumpeventlog/src/Android.mk b/dumpeventlog/src/Android.mk deleted file mode 100644 index f0c1aeb0d..000000000 --- a/dumpeventlog/src/Android.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2007 The Android Open Source Project -# -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_JAR_MANIFEST := ../etc/manifest.txt -LOCAL_JAVA_LIBRARIES := \ - ddmlib-prebuilt -LOCAL_MODULE := dumpeventlog - -include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/eventanalyzer/Android.bp b/eventanalyzer/Android.bp new file mode 100644 index 000000000..40f8276ab --- /dev/null +++ b/eventanalyzer/Android.bp @@ -0,0 +1,25 @@ +// +// Copyright (C) 2008 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. +// + +java_binary_host { + name: "eventanalyzer", + + srcs: ["src/**/*.java"], + + wrapper: "etc/eventanalyzer", + main_class: "com.android.eventanalyzer.EventAnalyzer", + libs: ["ddmlib-prebuilt"], +} diff --git a/eventanalyzer/Android.mk b/eventanalyzer/Android.mk deleted file mode 100644 index 18e730ed3..000000000 --- a/eventanalyzer/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2008 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. -# -EVENTANALUZER_LOCAL_DIR := $(call my-dir) -include $(EVENTANALUZER_LOCAL_DIR)/etc/Android.mk -include $(EVENTANALUZER_LOCAL_DIR)/src/Android.mk diff --git a/eventanalyzer/etc/Android.mk b/eventanalyzer/etc/Android.mk deleted file mode 100644 index e7703b412..000000000 --- a/eventanalyzer/etc/Android.mk +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (C) 2008 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_PREBUILT_EXECUTABLES := eventanalyzer -include $(BUILD_HOST_PREBUILT) - diff --git a/eventanalyzer/etc/manifest.txt b/eventanalyzer/etc/manifest.txt deleted file mode 100644 index 6d99ea175..000000000 --- a/eventanalyzer/etc/manifest.txt +++ /dev/null @@ -1 +0,0 @@ -Main-Class: com.android.eventanalyzer.EventAnalyzer diff --git a/eventanalyzer/src/Android.mk b/eventanalyzer/src/Android.mk deleted file mode 100644 index 1d55be526..000000000 --- a/eventanalyzer/src/Android.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright (C) 2008 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_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_JAR_MANIFEST := ../etc/manifest.txt -LOCAL_JAVA_LIBRARIES := \ - ddmlib-prebuilt -LOCAL_MODULE := eventanalyzer - -include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hierarchyviewer/Android.bp b/hierarchyviewer/Android.bp new file mode 100644 index 000000000..69134f0a6 --- /dev/null +++ b/hierarchyviewer/Android.bp @@ -0,0 +1,27 @@ +// Copyright (C) 2008 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. + +java_library_host { + name: "hierarchyviewer", + + srcs: ["src/**/*.java"], + java_resource_dirs: ["src/resources"], + + manifest: "etc/manifest.txt", + libs: [ + "ddmlib-prebuilt", + "org-openide-util", + "org-netbeans-api-visual", + ], +} diff --git a/hierarchyviewer/etc/Android.bp b/hierarchyviewer/etc/Android.bp new file mode 100644 index 000000000..c1d852510 --- /dev/null +++ b/hierarchyviewer/etc/Android.bp @@ -0,0 +1,18 @@ +// Copyright (C) 2008 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. + +sh_binary_host { + name: "hierarchyviewer1", + src: "hierarchyviewer1", +} diff --git a/hierarchyviewer/etc/Android.mk b/hierarchyviewer/etc/Android.mk deleted file mode 100644 index c61d76414..000000000 --- a/hierarchyviewer/etc/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (C) 2008 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_PREBUILT_EXECUTABLES := hierarchyviewer1 -include $(BUILD_HOST_PREBUILT) diff --git a/hierarchyviewer/src/Android.mk b/hierarchyviewer/src/Android.mk deleted file mode 100644 index f4c4838ab..000000000 --- a/hierarchyviewer/src/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (C) 2008 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_SRC_FILES := $(call all-subdir-java-files) -LOCAL_JAVA_RESOURCE_DIRS := resources - -LOCAL_JAR_MANIFEST := ../etc/manifest.txt -LOCAL_JAVA_LIBRARIES := \ - ddmlib-prebuilt \ - org-openide-util \ - org-netbeans-api-visual -LOCAL_MODULE := hierarchyviewer - -include $(BUILD_HOST_JAVA_LIBRARY) |