diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-01 16:36:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-01 16:36:01 +0000 |
commit | 629e33b0a34a6588c459275dfd74c371fbab6ad7 (patch) | |
tree | 9582b73da34e3d47e6becc21cf1bb96618424e99 | |
parent | f726e577d146925320bc98e1ea02c114f973ba5a (diff) | |
parent | 82d7036e3b9458bc4a0925c51952eea135aaefba (diff) | |
download | runtime-629e33b0a34a6588c459275dfd74c371fbab6ad7.tar.gz |
Merge "Remove unused Android.mk" into main am: abc72175e8 am: 79f6359cc1 am: 82d7036e3b
Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2854377
Change-Id: I2f6d9aeaab3c1a79d4d36160bf0b44fbb056a063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.mk | 16 | ||||
-rw-r--r-- | common/dex/Android.bp | 25 | ||||
-rw-r--r-- | common/dex/Android.mk | 28 |
3 files changed, 25 insertions, 44 deletions
diff --git a/Android.mk b/Android.mk deleted file mode 100644 index b4f7aa85..00000000 --- a/Android.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (C) 2013 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 := $(my-dir) diff --git a/common/dex/Android.bp b/common/dex/Android.bp new file mode 100644 index 00000000..2ccb30cc --- /dev/null +++ b/common/dex/Android.bp @@ -0,0 +1,25 @@ +// Copyright (C) 2013 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. + +package { + // See: http://go/android-license-faq + default_applicable_licenses: [ + "Android-Apache-2.0", + ], +} + +java_import_host { + name: "dex-prebuilt", + jars: ["dex-host-prebuilt.jar"], +} diff --git a/common/dex/Android.mk b/common/dex/Android.mk deleted file mode 100644 index d1a5bcb9..00000000 --- a/common/dex/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (C) 2013 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 := dex-prebuilt -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := dex-host-prebuilt.jar -LOCAL_IS_HOST_MODULE := true -LOCAL_MODULE_CLASS := JAVA_LIBRARIES -LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX) - -include $(BUILD_PREBUILT) |