Skip to content
This repository has been archived by the owner on Nov 1, 2020. It is now read-only.

Commit

Permalink
Move framework-specific portions of pathmap.mk into frameworks/base
Browse files Browse the repository at this point in the history
Test: make docs && make
Change-Id: I983a17bed8b14b6d94f7c4d3e900f4bb8bb34b86
  • Loading branch information
alanv committed Mar 3, 2017
1 parent a6d6e60 commit 63394b7
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ ifneq ($(ANDROID_BUILD_EMBEDDED),true)

include $(CLEAR_VARS)

# Load framework-specific path mappings used later in the build.
include $(LOCAL_PATH)/pathmap.mk

# FRAMEWORKS_BASE_SUBDIRS comes from build/core/pathmap.mk
LOCAL_SRC_FILES := \
$(call find-other-java-files,$(FRAMEWORKS_BASE_SUBDIRS)) \
Expand Down
64 changes: 64 additions & 0 deletions pathmap.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
#
# Copyright (C) 2016 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.
#

#
# A central place to define mappings to paths used by the framework build, to
# avoid hard-coding them in Android.mk files. Not meant for header file include
# directories, despite the fact that it was historically used for that!
#

# Import path mappings from the support library project. This will set up
# FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS and FRAMEWORKS_SUPPORT_JAVA_LIBRARIES for
# use later in this file.
include $(LOCAL_PATH)/../support/pathmap.mk

#
# A list of all source roots under frameworks/multidex.
#
FRAMEWORKS_MULTIDEX_SUBDIRS := \
multidex/library/src \
multidex/instrumentation/src

#
# A version of FRAMEWORKS_SUPPORT_SUBDIRS that is expanded to full paths from
# the root of the tree.
#
FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS += \
$(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS)) \
frameworks/rs/support

#
# A list of support library modules.
#
FRAMEWORKS_SUPPORT_JAVA_LIBRARIES += \
android-support-v8-renderscript \
android-support-multidex \
android-support-multidex-instrumentation

#
# A list of all documented source roots under frameworks/data-binding.
#
FRAMEWORKS_DATA_BINDING_SUBDIRS := \
baseLibrary/src/main \
extensions/library/src/main \
extensions/library/src/doc

#
# A version of FRAMEWORKS_DATA_BINDING_SUBDIRS that is expanded to full paths from
# the root of the tree.
#
FRAMEWORKS_DATA_BINDING_JAVA_SRC_DIRS := \
$(addprefix frameworks/data-binding/,$(FRAMEWORKS_DATA_BINDING_SUBDIRS))

0 comments on commit 63394b7

Please sign in to comment.