LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Emulator: update development to 2362bfb6

Browse Source 
Bug: 37302997

oc-emu-dev
commit 2362bfb6d6c4ee4540af5e69130951849c7e109e
Author: bohu <bohu@google.com>
Date:   Thu Apr 6 16:37:48 2017 -0700
Emulator: copy encryptionkey.img to SDK img zip

Change-Id: I057d58733bb39e0777d2f5c9494d5969ac46953a
(cherry picked from commit 6620016eb673ac885e5892604f04d3123a8ee0b9)
This commit is contained in:
bohu
2017-04-24 21:01:37 -07:00
committed by Griff Hazen
parent f0a6169b6c
commit 5c26bfa4bc
8 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/SdkSetup/Android.mk
View File

@@ -10,4 +10,7 @@ LOCAL_CERTIFICATE := platform
LOCAL_PROGUARD_ENABLED := disabled
LOCAL_STATIC_JAVA_LIBRARIES := \
gsf-client
include $(BUILD_PACKAGE)

1
apps/SdkSetup/AndroidManifest.xml
View File

@@ -18,6 +18,7 @@
package="com.android.sdksetup">
<!-- For miscellaneous settings -->
<uses-permission android:name="com.google.android.providers.settings.permission.WRITE_GSETTINGS" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />

6
apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
View File

@@ -25,7 +25,9 @@ import android.location.LocationManager;
import android.os.Bundle;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemProperties;
import android.provider.Settings;
import com.google.android.gsf.UseLocationForServices;
/**
* Entry point for SDK SetupWizard.
@@ -46,6 +48,10 @@ public class DefaultActivity extends Activity {
// Not needed since this SDK will contain the Settings app.
Settings.Secure.putString(getContentResolver(), Settings.Secure.LOCATION_PROVIDERS_ALLOWED,
LocationManager.GPS_PROVIDER);
// Allow google apps to have access to (emulated) location services in emulator
if (SystemProperties.getBoolean("ro.kernel.qemu", false)) {
UseLocationForServices.forceSetUseLocationForServices(this, true);
}
// enable install from non market
Settings.Global.putInt(getContentResolver(), Settings.Global.INSTALL_NON_MARKET_APPS, 1);

1
build/sdk-android-arm64-v8a.atree
View File

@@ -16,6 +16,7 @@
prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu
device/generic/goldfish/data/etc/encryptionkey.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/encryptionkey.img
# version files for the SDK updater, from development.git
${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_arm64-v8a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties

1
build/sdk-android-armeabi-v7a.atree
View File

@@ -17,6 +17,7 @@
# Copy the ARMv7 specific kernel image to .../kernel-qemu
prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu-armv7 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
prebuilts/qemu-kernel/${TARGET_ARCH}/ranchu/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu
device/generic/goldfish/data/etc/encryptionkey.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/encryptionkey.img
# version files for the SDK updater, from development.git
${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi-v7a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties

4
build/sdk-android-x86.atree
View File

@@ -14,8 +14,8 @@
# limitations under the License.
#
prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
prebuilts/qemu-kernel/${TARGET_ARCH}/ranchu/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu
prebuilts/qemu-kernel/${TARGET_ARCH}/3.18/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu
device/generic/goldfish/data/etc/encryptionkey.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/encryptionkey.img
# version files for the SDK updater, from development.git
${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_${TARGET_ARCH}_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties

4
build/sdk-android-x86_64.atree
View File

@@ -14,8 +14,8 @@
# limitations under the License.
#
prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
prebuilts/qemu-kernel/${TARGET_ARCH}/ranchu/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu
prebuilts/qemu-kernel/${TARGET_ARCH}/3.18/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu
device/generic/goldfish/data/etc/encryptionkey.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/encryptionkey.img
# version files for the SDK updater, from development.git
${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_${TARGET_ARCH}_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties

5
sys-img/advancedFeatures.ini
View File

@@ -1 +1,6 @@
GrallocSync = on
LogcatPipe = on
GLAsyncSwap = on
GLESDynamicVersion = on
GLDMA = on
EncryptUserData = on