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

Commit ef453812 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Remove more Android.mk files from build/make 

soong_ui is passing the Android.mk file list to Kati, and it ignores
Android.mk files found via symlinks, so we don't need the workarounds
for build/make/target/board/Android.mk and build/target/board/Android.mk
both existing.

We've got dist support in Soong now, so we can remove the signapk
Android.mk

Bug: 122332221
Test: m dist out/dist/signapk.jar out/dist/libconscrypt_openjdk_jni.so
Change-Id: I2ac9016b04146340c5ac80f7090d00e186023574
parent 4c4ba4e0

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.

tools/signapk/Android.bp

+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"],

    },

}