Revert "resolved conflicts for merge of 972433bd
to master"
This reverts commit5d0ec1aebb
, reversing changes made to4839e47309
.
This commit is contained in:
@@ -30,9 +30,3 @@ USE_CAMERA_STUB := true
|
|||||||
|
|
||||||
# Set /system/bin/sh to ash, not mksh, to make sure we can switch back.
|
# Set /system/bin/sh to ash, not mksh, to make sure we can switch back.
|
||||||
TARGET_SHELL := ash
|
TARGET_SHELL := ash
|
||||||
|
|
||||||
# Enable dex-preoptimization to speed up the first boot sequence
|
|
||||||
# of an SDK AVD. Note that this operation only works on Linux for now
|
|
||||||
ifeq ($(HOST_OS),linux)
|
|
||||||
WITH_DEXPREOPT := true
|
|
||||||
endif
|
|
||||||
|
@@ -20,9 +20,3 @@ USE_CAMERA_STUB := true
|
|||||||
|
|
||||||
# Set /system/bin/sh to ash, not mksh, to make sure we can switch back.
|
# Set /system/bin/sh to ash, not mksh, to make sure we can switch back.
|
||||||
TARGET_SHELL := ash
|
TARGET_SHELL := ash
|
||||||
|
|
||||||
# Enable dex-preoptimization to speed up the first boot sequence
|
|
||||||
# of an SDK AVD. Note that this operation only works on Linux for now
|
|
||||||
ifeq ($(HOST_OS),linux)
|
|
||||||
WITH_DEXPREOPT := true
|
|
||||||
endif
|
|
||||||
|
Reference in New Issue
Block a user