aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Baker-Malone <jbakermalone@google.com>2015-07-15 17:50:58 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-07-15 17:50:58 +0000
commit9deaf24c3d38214a832d3a79aa8a128b98912cee (patch)
tree621124f0ce2aad7fff1652aba05bb07c0da450b4
parenta724ba276b41cfca548488f3aaa0f49838763c5b (diff)
parenta04c81f2396d6fc2b93c8b77acd8985923959c22 (diff)
downloadqemu-9deaf24c3d38214a832d3a79aa8a128b98912cee.tar.gz
Merge "Add hardware-properties.ini for windows" into studio-1.4-dev
automerge: a04c81f * commit 'a04c81f2396d6fc2b93c8b77acd8985923959c22': Add hardware-properties.ini for windows
-rw-r--r--build.gradle5
1 files changed, 4 insertions, 1 deletions
diff --git a/build.gradle b/build.gradle
index fcef9283b1..cb0b81a14e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,6 @@ sdk {
into 'lib'
notice null
}
-
item("$buildDefaultEmulator.output/emulator") {
executable true
builtBy buildDefaultEmulator
@@ -93,6 +92,10 @@ sdk {
}
windows {
+ item('android/avd/hardware-properties.ini') {
+ into 'lib'
+ notice null
+ }
item("$buildWindowsEmulator.output/emulator.exe") {
builtBy buildWindowsEmulator
}