Ji-Hwan Lee
cd18df970e
am eaf4c758: am a7748859: Merge "Clear *.ini and skin directory on installclean"
...
* commit 'eaf4c7581f3c736ada725f75bb1b6218be26c361':
Clear *.ini and skin directory on installclean
2014-05-16 02:00:37 +00:00
Ji-Hwan Lee
eaf4c7581f
am a7748859: Merge "Clear *.ini and skin directory on installclean"
...
* commit 'a7748859d741af2f7e22f3333030b937269d33c7':
Clear *.ini and skin directory on installclean
2014-05-16 01:57:35 +00:00
Ying Wang
0a2c133dc8
am 5b768a72: am f14653ce: Merge "x86_common.mk has been replaced by HOST_x86_common.mk"
...
* commit '5b768a7253f9d474c48c03321c2fdcbc2b8abc40':
x86_common.mk has been replaced by HOST_x86_common.mk
2014-05-16 01:57:11 +00:00
Ji-Hwan Lee
a7748859d7
Merge "Clear *.ini and skin directory on installclean"
2014-05-16 01:54:49 +00:00
Ying Wang
5b768a7253
am f14653ce: Merge "x86_common.mk has been replaced by HOST_x86_common.mk"
...
* commit 'f14653cee4c98094d171c194b1af3e14b087ab09':
x86_common.mk has been replaced by HOST_x86_common.mk
2014-05-16 01:54:12 +00:00
Ying Wang
f14653cee4
Merge "x86_common.mk has been replaced by HOST_x86_common.mk"
2014-05-16 01:51:34 +00:00
Ying Wang
a303c4f546
x86_common.mk has been replaced by HOST_x86_common.mk
...
Change-Id: I19eea82bb35d3f65a2d894c687131a1eafbe2cc9
2014-05-15 18:50:06 -07:00
Christopher Ferris
cea8763c26
am 7c67257b: am f8cfbc0a: Merge "Print all 2ND variables."
...
* commit '7c67257b8ee9dbb41213d7f75b36cc89f8ffcef0':
Print all 2ND variables.
2014-05-16 01:19:29 +00:00
Christopher Ferris
7c67257b8e
am f8cfbc0a: Merge "Print all 2ND variables."
...
* commit 'f8cfbc0a10b75e6ec22b6e80b90df2a4386887b2':
Print all 2ND variables.
2014-05-16 01:17:13 +00:00
Christopher Ferris
f8cfbc0a10
Merge "Print all 2ND variables."
2014-05-16 01:14:43 +00:00
Ji-Hwan Lee
0a5b178fc3
Clear *.ini and skin directory on installclean
...
Currently, skin directory remains across different emulator targets, and
need manual removal. Also, clear hardware-qemu.ini and config.ini.
(See https://android-review.googlesource.com/94692 for config.ini)
Change-Id: Iaa5849ad043ed3f317325ba1d6df287953636f7a
2014-05-15 20:59:01 +09:00
Narayan Kamath
1027ea9f6c
am 59f04e88: am 944a3810: Merge "Fix executable symlinks."
...
* commit '59f04e889e30e274d7efd4224b60d521d7361d8b':
Fix executable symlinks.
2014-05-15 09:45:30 +00:00
Narayan Kamath
59f04e889e
am 944a3810: Merge "Fix executable symlinks."
...
* commit '944a38104a553d84c44fa87b2378ebee66a12349':
Fix executable symlinks.
2014-05-15 09:41:37 +00:00
Narayan Kamath
944a38104a
Merge "Fix executable symlinks."
2014-05-15 09:36:26 +00:00
Christopher Ferris
4fe22ae9e8
Print all 2ND variables.
...
Change-Id: I11180a3ec3481d293100c59c331f05db9e6a689b
2014-05-14 19:16:25 -07:00
Ying Wang
e50f2d9f32
am 40b49d30: am a74ade94: Merge "Support host multilib build"
...
* commit '40b49d3043bd41ca5548b99b537038187fdca258':
Support host multilib build
2014-05-15 00:44:53 +00:00
Ying Wang
40b49d3043
am a74ade94: Merge "Support host multilib build"
...
* commit 'a74ade945776e80f99f3b05d06a131cfd353c3f6':
Support host multilib build
2014-05-15 00:41:37 +00:00
Ying Wang
a74ade9457
Merge "Support host multilib build"
2014-05-15 00:37:26 +00:00
Ying Wang
6feb6d5607
Support host multilib build
...
This change basically ported our target multilib to the host side.
It supports 2 host build modes: x86 and x86_64 multilib build.
For now you need to set "BUILD_HOST_64bit=true" to switch to x86_64
multilib build. Later we'll default to x86_64 build and have a flag
to force 32-bit only build, which may be needed by SDK build.
In host module definition, like in target ones, you can use the
following
LOCAL variables to set up multilib configuration:
LOCAL_MULTILIB: can be "both", "first", "32" or "64".
It also supports the same set of arch or 32-vs-64 specific LOCAL
variables.
By default, it builds only for the first arch.
To keep path compatibility, in x86_64 build files are still output to
out/host/linux-x86; Both 32-bit and 64-bit executables are in
out/host/linux-86/bin;
In x86_64 build 32-bit shared libraries are installed to
out/host/linux-x86/lib32
and 64-bit shared libraries are installed to out/host/linux-x86/lib;
32-bit object files are output to out/host/linux-x86/obj32 and 64-bit
object files
are output to out/host/linux-x86/obj.
Bug: 13751317
Change-Id: I6044f83b7db369a33e05209e8c588eb6dc83409f
2014-05-14 16:55:04 -07:00
Dirk Dougherty
8fdd4a0b56
am 7db3e8a5: am 9890fe24: am c3921656: Add templates support for dynamic content and sticky nav bar.
...
* commit '7db3e8a518ee51ba1a511948de71675e3457ff13':
Add templates support for dynamic content and sticky nav bar.
2014-05-14 21:02:39 +00:00
Dirk Dougherty
7db3e8a518
am 9890fe24: am c3921656: Add templates support for dynamic content and sticky nav bar.
...
* commit '9890fe24f1451d0393337904852d0ca24808c2bc':
Add templates support for dynamic content and sticky nav bar.
2014-05-14 20:56:51 +00:00
Dirk Dougherty
9890fe24f1
am c3921656: Add templates support for dynamic content and sticky nav bar.
...
* commit 'c3921656f544af2fac99c3fab9ea5139150d45a2':
Add templates support for dynamic content and sticky nav bar.
2014-05-14 20:53:13 +00:00
Sreeram Ramachandran
d86151135a
am 6af650d6: am da492d7e: Merge "Introduce netd_client, a dynamic library that talks to netd."
...
* commit '6af650d6e3d1a2d4e728151c7698c6d5ea906b59':
Introduce netd_client, a dynamic library that talks to netd.
2014-05-14 19:51:41 +00:00
Sreeram Ramachandran
6af650d6e3
am da492d7e: Merge "Introduce netd_client, a dynamic library that talks to netd."
...
* commit 'da492d7ed029b721bef02ca02d98148d5d9f4b3d':
Introduce netd_client, a dynamic library that talks to netd.
2014-05-14 19:48:13 +00:00
Sreeram Ramachandran
da492d7ed0
Merge "Introduce netd_client, a dynamic library that talks to netd."
2014-05-14 19:42:41 +00:00
Kenny Root
d36d61bec8
am abe42666: Move libkeystore to minimal
...
* commit 'abe426663a0534db685f2d44b8cd9a47480fb52f':
Move libkeystore to minimal
2014-05-14 19:40:53 +00:00
Dirk Dougherty
c3921656f5
Add templates support for dynamic content and sticky nav bar.
...
Change-Id: Icb4e492a991a19e3e1eac72eafc83623b00be5de
2014-05-14 12:00:34 -07:00
Kenny Root
abe426663a
Move libkeystore to minimal
...
The ENGINE needs to be included to make the keystore useful, so if
keystore is included, also include libkeystore.
Change-Id: I042a4eb02450d090f10437deb736e1c4a4105df7
2014-05-14 11:50:35 -07:00
Sreeram Ramachandran
a280216494
Introduce netd_client, a dynamic library that talks to netd.
...
(cherry picked from commit 440de6b9f715cb18b8ee888c58d5c7a659ff5073)
Change-Id: Ib6198e19dbc306521a26fcecfdf6e8424d163fc9
2014-05-14 11:21:01 -07:00
Narayan Kamath
4fb8122bcb
Fix executable symlinks.
...
32 bit targets will leave TARGET_PREFER_{32,64}_BIT_APPS unset
so adjust accordingly. Also clean up an explanatory comment.
Change-Id: I1f6faa640e4e862631fff49f7c565766ef2c567f
2014-05-14 18:26:48 +01:00
Ying Wang
5c7c9887f4
am 03d02a26: am b082b5f1: Merge "Disable DEXPREOPT until we have multilib support"
...
* commit '03d02a2687cbd59b8871ccbe0eeb3c2c51df063c':
Disable DEXPREOPT until we have multilib support
2014-05-13 16:58:47 +00:00
Ying Wang
03d02a2687
am b082b5f1: Merge "Disable DEXPREOPT until we have multilib support"
...
* commit 'b082b5f1b2d1a45ee91de186428d5e341d02c08a':
Disable DEXPREOPT until we have multilib support
2014-05-13 16:54:29 +00:00
Ying Wang
b082b5f1b2
Merge "Disable DEXPREOPT until we have multilib support"
2014-05-13 16:49:32 +00:00
Ying Wang
a93102d411
Disable DEXPREOPT until we have multilib support
...
Bug: 14694978
Change-Id: I31d0f1c78a668435646c99e659cec46cd2f3ddf7
2014-05-13 09:46:23 -07:00
Ying Wang
37aacb8a31
am 72344a73: am 8012d8f3: Merge "Treat denver like cortex-a15."
...
* commit '72344a7329ab984de716b630cb88039d9ed820a0':
Treat denver like cortex-a15.
2014-05-13 16:38:47 +00:00
Ying Wang
72344a7329
am 8012d8f3: Merge "Treat denver like cortex-a15."
...
* commit '8012d8f353304ef4487545648455d34d6ffc2741':
Treat denver like cortex-a15.
2014-05-13 16:34:00 +00:00
Ying Wang
8012d8f353
Merge "Treat denver like cortex-a15."
2014-05-13 16:28:10 +00:00
Ying Wang
fb910ddb1d
Treat denver like cortex-a15.
...
See also build/core/combo/arch/arm/armv7-a-neon.mk.
Change-Id: Ie18e1f133f56a9f7da80e304052c92edad933a31
2014-05-13 09:02:56 -07:00
Andrew Hsieh
f6566fd1f9
am e7b99aec: am fb1f38ec: Merge "Define __USE_MINGW_ANSI_STDIO for windows build"
...
* commit 'e7b99aec678426bdd19548c9f62cd3694c51702c':
Define __USE_MINGW_ANSI_STDIO for windows build
2014-05-13 00:59:28 +00:00
Andrew Hsieh
e7b99aec67
am fb1f38ec: Merge "Define __USE_MINGW_ANSI_STDIO for windows build"
...
* commit 'fb1f38ecbacfb5dc2cc4f3f83eb814ac2aa090ca':
Define __USE_MINGW_ANSI_STDIO for windows build
2014-05-13 00:57:08 +00:00
Andrew Hsieh
fb1f38ecba
Merge "Define __USE_MINGW_ANSI_STDIO for windows build"
2014-05-13 00:53:45 +00:00
Ian Rogers
8c6360e62c
am 50912342: am f544a5f4: Merge "Place ISA in ART boot image name."
...
* commit '50912342f10e769f17b9ea0e2174633af6f95cd3':
Place ISA in ART boot image name.
2014-05-12 23:04:31 +00:00
Ian Rogers
50912342f1
am f544a5f4: Merge "Place ISA in ART boot image name."
...
* commit 'f544a5f4d57750b569333a59d57f568121f6f4a3':
Place ISA in ART boot image name.
2014-05-12 23:00:45 +00:00
Ian Rogers
f544a5f4d5
Merge "Place ISA in ART boot image name."
2014-05-12 22:45:54 +00:00
Ian Rogers
334497b8b6
Place ISA in ART boot image name.
...
Depends upon:
https://android-review.googlesource.com/#/c/94096/2
Change-Id: I79bec60a17ea7cf9214e56f8035d4a1b80b0eeb6
2014-05-12 15:17:25 -07:00
Ying Wang
66f2af4e55
am 6c432940: am dcdc985c: Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version"
...
* commit '6c432940599d5f5d3d11a26f12342845433f0a98':
executable_prefer_symlink: add makefile for creating symlink to prefer version
2014-05-12 16:57:42 +00:00
Ying Wang
6c43294059
am dcdc985c: Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version"
...
* commit 'dcdc985c47338c29e66a22941904abd4171607c9':
executable_prefer_symlink: add makefile for creating symlink to prefer version
2014-05-12 16:53:01 +00:00
Ying Wang
dcdc985c47
Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version"
2014-05-12 16:49:16 +00:00
David 'Digit' Turner
873782ccd4
am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5
...
* commit '9e3259f50d6aa2ca4430430d71d2fffd58662650':
Disable emulator from platform builds.
envsetup.sh: Use prebuilt emulator binaries if available.
2014-05-11 09:23:35 +00:00
David 'Digit' Turner
9e3259f50d
am fb67f05d: Merge changes I53b2ada9,I30794ea5
...
* commit 'fb67f05d3d6deb2400fd09390550a7858a3c3158':
Disable emulator from platform builds.
envsetup.sh: Use prebuilt emulator binaries if available.
2014-05-11 09:19:43 +00:00