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

Commit 79960bba authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am fa2d8ace: merge from open-source master 

Merge commit 'fa2d8ace'

* commit 'fa2d8ace':
  Add full_x86 product.
parents c5a3f42a fa2d8ace

envsetup.sh

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ function add_lunch_combo() 


# add the default one here

add_lunch_combo full-eng

add_lunch_combo generic_x86-eng

add_lunch_combo full_x86-eng



# if we're on linux, add the simulator.  There is a special case

# in lunch to deal with the simulator

target/product/AndroidProducts.mk

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ PRODUCT_MAKEFILES := \ 
    $(LOCAL_DIR)/generic.mk \

    $(LOCAL_DIR)/generic_x86.mk \

    $(LOCAL_DIR)/full.mk \

    $(LOCAL_DIR)/full_x86.mk \

    $(LOCAL_DIR)/sdk.mk \

    $(LOCAL_DIR)/sim.mk \

    $(LOCAL_DIR)/large_emu_hw.mk

target/product/full_x86.mk

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

# Copyright (C) 2009 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 is a build configuration for a full-featured build of the

# Open-Source part of the tree. It's geared toward a US-centric

# x86 build, but all those aspects can be overridden

# in inherited configurations.



# If running on an emulator or some other device that has a LAN connection

# that isn't a wifi connection. This will instruct init.rc to enable the

# network connection so that you can use it with ADB

ifdef NET_ETH0_STARTONBOOT

  PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1

endif



$(call inherit-product, build/target/product/full.mk)



# Overrides

PRODUCT_NAME := full_x86

PRODUCT_DEVICE := generic_x86

PRODUCT_MODEL := Full Android x86