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

Commit 6820c719 authored by Bill Peckham's avatar Bill Peckham Committed by Automerger Merge Worker
Browse files

Merge "Export TARGET_ENABLE_MEDIADRM_64 to Soong." am: 2dc36754

Original change: https://android-review.googlesource.com/c/platform/build/+/1371618

Change-Id: I707fc693cad6d6e77e2c984936ebe5101f1ca4c3
parents 6235a190 2dc36754
Loading
Loading
Loading
Loading
+29 −0
Original line number Original line Diff line number Diff line
# Copyright (C) 2020 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.

# This file defines the Soong Config Variable namespace ANDROID, and also any
# variables in that namespace.

# The expectation is that no vendor should be using the ANDROID namespace. This
# check ensures that we don't collide with any existing vendor usage.

ifdef SOONG_CONFIG_ANDROID
$(error The Soong config namespace ANDROID is reserved.)
endif

$(call add_soong_config_namespace,ANDROID)

# Add variables to the namespace below:

$(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64)
+1 −0
Original line number Original line Diff line number Diff line
@@ -1227,6 +1227,7 @@ dont_bother_goals := out \
    product-graph dump-products
    product-graph dump-products


ifeq ($(CALLED_FROM_SETUP),true)
ifeq ($(CALLED_FROM_SETUP),true)
include $(BUILD_SYSTEM)/android_soong_config_vars.mk
include $(BUILD_SYSTEM)/ninja_config.mk
include $(BUILD_SYSTEM)/ninja_config.mk
include $(BUILD_SYSTEM)/soong_config.mk
include $(BUILD_SYSTEM)/soong_config.mk
endif
endif