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

Commit 03e7e818 authored by Jeff Gaston's avatar Jeff Gaston Committed by android-build-merger
Browse files

Merge "Remove the need to find Android.mk files via directory symlinks"

am: 6ab53d72

Change-Id: I0495d45001821d095531d5be7c049fc2836888f7
parents 3b16c4e7 6ab53d72
Loading
Loading
Loading
Loading

Android.mk

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line
LOCAL_PATH := $(call my-dir)

# We're relocating the build project to a subdirectory, then using symlinks
# to expose the subdirectories where they used to be. If the manifest hasn't
# been updated, we need to include all the subdirectories.
ifeq ($(LOCAL_PATH),build)
include $(call first-makefiles-under,$(LOCAL_PATH))
endif

target/Android.mk

0 → 100644
+23 −0
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
+4 −0
Original line number Diff line number Diff line
@@ -16,4 +16,8 @@

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