diff options
author | Sasha Smundak <asmundak@google.com> | 2019-01-10 21:12:15 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-01-10 21:12:15 -0800 |
commit | 3ac5d2a593465f70b12dcc93741ad683b2ab167b (patch) | |
tree | 3cb814041dfeee3fe814d9c9f0a6b4f835587b6c | |
parent | 1ea5ef90cae1ed6bfc5867ef9a96c87ff760535b (diff) | |
parent | 9fed5465c6a5818e41159aad7764c2bd7b8c3fa8 (diff) | |
download | dalvik-3ac5d2a593465f70b12dcc93741ad683b2ab167b.tar.gz |
Merge "Convert Android.mk files to Android.bp." am: a1b87e9f3a am: 991373da43
am: 9fed5465c6
Change-Id: I3f18a67f488414887fff388ca316cb1fb54ba741
-rw-r--r-- | Android.mk | 2 | ||||
-rw-r--r-- | dexgen/Android.bp | 19 | ||||
-rw-r--r-- | dexgen/Android.mk | 26 | ||||
-rw-r--r-- | dx/Android.mk | 6 | ||||
-rw-r--r-- | dx/junit-tests/Android.bp | 10 | ||||
-rw-r--r-- | dx/junit-tests/Android.mk | 9 | ||||
-rw-r--r-- | tools/Android.mk | 1 |
7 files changed, 29 insertions, 44 deletions
diff --git a/Android.mk b/Android.mk index 39feee1d9..3d23f5470 100644 --- a/Android.mk +++ b/Android.mk @@ -15,9 +15,7 @@ LOCAL_PATH := $(call my-dir) subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \ - dexgen \ dx \ - tools \ )) include $(subdirs) diff --git a/dexgen/Android.bp b/dexgen/Android.bp new file mode 100644 index 000000000..fc98bc39f --- /dev/null +++ b/dexgen/Android.bp @@ -0,0 +1,19 @@ +// Copyright (C) 2010 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 { + name: "dexgen", + sdk_version: "4", + srcs: ["src/**/*.java"], +} diff --git a/dexgen/Android.mk b/dexgen/Android.mk deleted file mode 100644 index 59d623adb..000000000 --- a/dexgen/Android.mk +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2010 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_SDK_VERSION := 4 -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_MODULE := dexgen -LOCAL_MODULE_TAGS := optional - -include $(BUILD_STATIC_JAVA_LIBRARY) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/dx/Android.mk b/dx/Android.mk index bf6acc28d..c6aa01dd4 100644 --- a/dx/Android.mk +++ b/dx/Android.mk @@ -127,10 +127,4 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/jasmin.jar | $(ACP) INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE) -# the other stuff -# ============================================================ -subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \ - junit-tests \ - )) -include $(subdirs) diff --git a/dx/junit-tests/Android.bp b/dx/junit-tests/Android.bp new file mode 100644 index 000000000..9caeb9629 --- /dev/null +++ b/dx/junit-tests/Android.bp @@ -0,0 +1,10 @@ +// Copyright 2011 The Android Open Source Project + +java_test_host { + name: "dx-tests", + srcs: ["**/*.java"], + libs: [ + "dx", + "junit-host", + ], +} diff --git a/dx/junit-tests/Android.mk b/dx/junit-tests/Android.mk deleted file mode 100644 index b6dc00f11..000000000 --- a/dx/junit-tests/Android.mk +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2011 The Android Open Source Project - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_JAVA_LIBRARIES := dx junit-host -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE:= dx-tests -include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/tools/Android.mk b/tools/Android.mk deleted file mode 100644 index 65711611c..000000000 --- a/tools/Android.mk +++ /dev/null @@ -1 +0,0 @@ -include $(all-subdir-makefiles) |