Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebe0b7a1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove more Android.mk files from build/make"

parents 575402b9 ef453812
Loading
Loading
Loading
Loading

Android.mk

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line
include $(call all-subdir-makefiles)

target/Android.mk

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line
#
# Copyright (C) 2017 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)

# Only if this Android.mk was included not by a symlink should it be used.
# This facilitates the transition away from symlinks: b/64397960
ifeq ($(LOCAL_PATH),build/make/target)
include $(call first-makefiles-under,$(LOCAL_PATH))
endif

tools/Android.mk

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line
#
# 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)

# Only if this Android.mk was included not by a symlink should it be used.
# This facilitates the transition away from symlinks: b/64397960
ifeq ($(LOCAL_PATH),build/make/tools)
include $(call all-makefiles-under,$(LOCAL_PATH))
endif

tools/droiddoc/Android.mk

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line
# 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)

# Droiddoc is now Doclava -- See external/doclava.
+6 −0
Original line number Diff line number Diff line
@@ -28,4 +28,10 @@ java_library_host {
    ],

    required: ["libconscrypt_openjdk_jni"],

    // The post-build signing tools need signapk.jar (and its shared libraries,
    // handled in their own Android.bp files)
    dist: {
        targets: ["droidcore"],
    },
}
Loading