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

Commit 98716354 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes from topic "soong_support_libs" 

* changes:
  Fix support libraries dependencies based on Soong modules
  Always statically include Support Libraries, move SDK definitions up a dir
  Move Support Library dependencies to their own var with resolution
  Allow projects to define their own globally-available variables
parents ab235a9f 85609308

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ LOCAL_DEX_PREOPT_IMAGE_LOCATION:= 
LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING:=

LOCAL_DEX_PREOPT:= # '',true,false,nostripping

LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG:=

LOCAL_DISABLE_RESOLVE_SUPPORT_LIBRARIES:=

LOCAL_DONT_CHECK_MODULE:=

# Don't delete the META_INF dir when merging static Java libraries.

LOCAL_DONT_DELETE_JAR_META_INF:=

core/config.mk

+3 −0
Original line number Diff line number Diff line
@@ -110,6 +110,9 @@ include $(BUILD_SYSTEM)/math.mk 
# Various mappings to avoid hard-coding paths all over the place

include $(BUILD_SYSTEM)/pathmap.mk



# Allow projects to define their own globally-available variables

include $(BUILD_SYSTEM)/project_definitions.mk



# ###############################################################

# Build system internal files

# ###############################################################

core/package_internal.mk

+3 −0
Original line number Diff line number Diff line
@@ -314,6 +314,9 @@ LOCAL_RESOURCE_DIR := $(data_binding_res_out) 
LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.databinding.library

endif  # LOCAL_DATA_BINDING



# Process Support Library dependencies.

include $(BUILD_SYSTEM)/support_libraries.mk



# If the module is a compressed module, we don't pre-opt it because its final

# installation location will be the data partition.

ifdef LOCAL_COMPRESSED_MODULE

core/project_definitions.mk

0 → 100644
+24 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2018 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.

#



#

# Allow projects to define their own globally-available variables.

#



#

# Include definitions for prebuilt SDK, if present.

#

-include prebuilts/sdk/current/definitions.mk

core/static_java_library.mk

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ ifdef LOCAL_AAPT2_ONLY 
LOCAL_USE_AAPT2 := true

endif



# Process Support Library dependencies.

include $(BUILD_SYSTEM)/support_libraries.mk



# Hack to build static Java library with Android resource

# See bug 5714516

all_resources :=