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

Commit 8eb2bad5 authored by Jesse Hall's avatar Jesse Hall Committed by Android Git Automerger
Browse files

am f8728e66: Merge "Add emulator modules to PRODUCT_PACKAGES in full and sdk products" 

* commit 'f8728e66':
  Add emulator modules to PRODUCT_PACKAGES in full and sdk products
parents e6f3c033 f8728e66

target/product/emulator.mk

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

# Copyright (C) 2012 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 is included by other product makefiles to add all the

# emulator-related host modules to PRODUCT_PACKAGES.

#



PRODUCT_PACKAGES += \

	emulator \

	emulator-x86 \

	emulator-arm \

	emulator-mips \

	emulator64-x86 \

	emulator64-arm \

	emulator64-mips \

	libOpenglRender \

	libGLES_CM_translator \

	libGLES_V2_translator \

	libEGL_translator \

	lib64OpenglRender \

	lib64GLES_CM_translator \

	lib64GLES_V2_translator \

	lib64EGL_translator

target/product/full_base.mk

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ PRODUCT_PACKAGES += \ 
    PhaseBeam \

    VisualizationWallpapers



include $(SRC_TARGET_DIR)/product/emulator.mk



# Additional settings used in all AOSP builds

PRODUCT_PROPERTY_OVERRIDES := \

    ro.com.android.dateformat=MM-dd-yyyy \

target/product/sdk.mk

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ PRODUCT_PACKAGES := \ 
	rild \

	LegacyCamera



include $(SRC_TARGET_DIR)/product/emulator.mk



# Define the host tools and libs that are parts of the SDK.

-include sdk/build/product_sdk.mk