Commit graph

15821 commits

Author SHA1 Message Date
Ying Wang
9889229133 am 3afc688a: Merge "javac: rename common_flags to avoid conflictions"
* commit '3afc688a6acc1753a2b104719a7a27f223f50750':
  javac: rename common_flags to avoid conflictions
2014-05-09 16:45:44 +00:00
Ying Wang
3afc688a6a Merge "javac: rename common_flags to avoid conflictions" 2014-05-09 16:40:33 +00:00
Andrew Hsieh
48f239c94f Disable canonical prefixes of system headers
GCC know a few pre-defined paths (relative to its location) to
search for headers, libraries, program, etc.  By default GCC prefixes
its own path(argv[0]) and calls realpath() which result in absolute
path with all symlink, . and .. removed.

It's usually good to have canonicalised paths, but absolute paths
in *.d file can cause unnecessary relinking when stale entries
in ccache cache hit

Add -no-canonical-prefixes (gcc>=4.6) and
-fno-canonical-system-headers (gcc>4.6) to disable realpath() on
prefixed paths

Change-Id: I58d739e61fb013015fb05a9c98b2132b307f915a
2014-05-09 22:12:49 +08:00
David 'Digit' Turner
f6e2694dd2 Disable emulator from platform builds.
Now that emulator prebuilts are available under prebuilts/android-emulator/,
disable building the emulator from source in all platform builds, except
if one defines BUILD_EMULATOR to 'true' in its environment.

NOTE: This patch should be applied after this one to avoid issues
      with the GPU emulation libraries:
            https://android-review.googlesource.com/93980

Change-Id: I53b2ada9ca0c2e159dccee7cdca7f55f6b0d1d42
2014-05-09 15:32:39 +02:00
David 'Digit' Turner
94d16e5a0f envsetup.sh: Use prebuilt emulator binaries if available.
This patch changes the setpaths() function in envsetup.sh to probe
for prebuilts/android-emulator/<host>/, and prepend it to PATH if
it exists.

See https://android-review.googlesource.com/#/c/93399/
for a related patch that adds the binaries.

BUG=13747402

Change-Id: I30794ea52f6dfc58908e6271f2c0da8e2f0b68e8
2014-05-09 15:32:32 +02:00
Yongqin Liu
d1d42e88dc executable_prefer_symlink: add makefile for creating symlink to prefer version
For a 64bit target, we can have support for both 32bit and 64bit version
binary(like app_process, dalvikvm), and there are some commands like am/pm
will call these commands to implement it's function.

In some targets it will prefer to use the 32bit version, and in other targets
it will prefer to use the 64bit version. So this change is to add the common
work for creating the symlink to the prefer version binary,and avoid the
change on the caller commands side like am/pm.

In this change, it uses TARGET_PREFER_32_BIT_APPS to decide linking to
32bit version or 64bit version.

Change-Id: I96f041c0e0ededd953feead30ec63ad63e945a6f
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2014-05-09 14:08:49 +08:00
Andrew Hsieh
d322f2a6ef Define __USE_MINGW_ANSI_STDIO for windows build
Some printf/scanf functions in Windows aren't C99 compatible.
Define __USE_MINGW_ANSI_STDIO for mingw compiler to use it's own set of
replacement libraries which are more C99-like.

Change-Id: I51dfa582971ec0487409067e8bb7fe3a44577b93
2014-05-09 11:45:13 +08:00
Nick Reuter
c43ab6edc2 javac: rename common_flags to avoid conflictions
* Currently the flag conflicts with one seen in hardware/qcom
   rename to avoid issues.

Change-Id: I876fcd6a254f349dc5260509bcddb0367a7d49d8
Signed-off-by: Nick Reuter <nreuter85@gmail.com>
2014-05-08 22:15:35 -05:00
Xavier Ducrohet
05a7a955c1 am afe444a5: Merge "Remove SDK Tools from platform builds."
* commit 'afe444a564ed72cdda792822a0c9dab57a8c9172':
  Remove SDK Tools from platform builds.
2014-05-09 00:52:34 +00:00
Xavier Ducrohet
afe444a564 Merge "Remove SDK Tools from platform builds." 2014-05-09 00:46:45 +00:00
Ying Wang
d6214b3161 am 0d4b3df6: Merge "Target "tests" now only builds the modules tagged as "tests""
* commit '0d4b3df6aa495ab2aaabe3a8d5c9c6ad69ab5667':
  Target "tests" now only builds the modules tagged as "tests"
2014-05-09 00:06:36 +00:00
Ying Wang
2d41656cdb am f6603f75: Merge "Add tool to package up built modules."
* commit 'f6603f753d492823e19d0677d5a9ccfc16f51805':
  Add tool to package up built modules.
2014-05-09 00:06:35 +00:00
Ying Wang
0d4b3df6aa Merge "Target "tests" now only builds the modules tagged as "tests"" 2014-05-09 00:03:03 +00:00
Ying Wang
f6603f753d Merge "Add tool to package up built modules." 2014-05-09 00:02:50 +00:00
Ying Wang
07b2055d3e Target "tests" now only builds the modules tagged as "tests"
But not install them.
This prevents "make tests" polluting system.img or userdata.img.
We have new mechanism to build and package up modules into zip file in
build/core/tasks/tools.
Change package-modules.mk to install DATA/ instead of data/ in the
zip file; Better handle of module name conflicting.

Bug: 13585955
Change-Id: I7586a8c7995b984c9ead0ba2fa84dd5d2dd20bd1
2014-05-08 17:01:25 -07:00
Ying Wang
989ac38d93 Add tool to package up built modules.
With this change, you can package up modules while avoiding installing
them to the system.img or userdata.img.
- build/core/tasks/tools/package-modules.mk
  You can use this template to package up modules into a zip file and
  preserve the installed file paths.
- LOCAL_PICKUP_FILES, you can use this variable to package up extra
  files/directories.

Bug: 13585955
Change-Id: I103042b24ccf17cf5dc90c016d97ed1dd293e50b
2014-05-08 17:01:06 -07:00
Tsu Chiang Chuang
5bd1da1e0e am 41d8760d: Merge "Bump userdata image size from 200 MB to 550 MB"
* commit '41d8760d683f21d2868fbfb6872a3cf65b9edbcb':
  Bump userdata image size from 200 MB to 550 MB
2014-05-08 22:50:27 +00:00
Tsu Chiang Chuang
41d8760d68 Merge "Bump userdata image size from 200 MB to 550 MB" 2014-05-08 22:39:00 +00:00
Brian Carlstrom
4ed19f0f42 am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"
* commit '1e63c2d15cba608a154bbd563f96dde334691147':
  Add dalvik.vm.dex2oat-flags for eng build
2014-05-08 21:53:14 +00:00
Xavier Ducrohet
51e303a281 Remove SDK Tools from platform builds.
(cherry picked from commit edf30221b4890673dc714a1efef3b5faf4ae1522)

Change-Id: Ia74c2ece1528adca10a4eec24e73b4ce361af1a9
2014-05-08 14:50:15 -07:00
Brian Carlstrom
1e63c2d15c Merge "Add dalvik.vm.dex2oat-flags for eng build" 2014-05-08 21:49:31 +00:00
Ying Wang
0a61a6032c am 3b15cdb8: Merge "Apply LOCAL_LDLIBS to target build rules too."
* commit '3b15cdb854dfe79507cace8ce54828861bbe7a8c':
  Apply LOCAL_LDLIBS to target build rules too.
2014-05-08 00:21:35 +00:00
Ying Wang
3b15cdb854 Merge "Apply LOCAL_LDLIBS to target build rules too." 2014-05-08 00:15:30 +00:00
Ying Wang
de36cd72e8 Apply LOCAL_LDLIBS to target build rules too.
Use LOCAL_LDLIBS to link against prebuilt libraries (such as NDK
libraries).
Previously LOCAL_LDLIBS only applies to host modules and the behaviour
confuses users.

Change-Id: I515546d7b59ef54e8ef09050eb58ec63534c9291
2014-05-07 11:33:19 -07:00
Brian Carlstrom
fceb115bd6 Add dalvik.vm.dex2oat-flags for eng build
Bug: 12869646
Change-Id: I794320267c846225931f12075c7f32d7848081e9
2014-05-06 20:40:11 -07:00
Tsu Chiang Chuang
27a026c802 Bump userdata image size from 200 MB to 550 MB
Change-Id: Ibdf319091a7187dc894f4a923d40868cec4b7b41
2014-05-06 17:40:23 -07:00
Ying Wang
ba0bb801c3 am a16583a0: Merge "Fix windows/mingw build."
* commit 'a16583a0880f574937f08bf2c86be72b0f4b9274':
  Fix windows/mingw build.
2014-05-06 19:16:12 +00:00
Ying Wang
a16583a088 Merge "Fix windows/mingw build." 2014-05-06 19:13:21 +00:00
Ying Wang
1401c76c2f Fix windows/mingw build.
Bug: 14446414
Change-Id: I9d12ed8afb6d4d5a09ef9b2844eb193b52b74271
2014-05-06 12:11:09 -07:00
Ying Wang
c3b2314a58 am a37550ed: Merge "Use prebuilt flex."
* commit 'a37550edd39b3520839251b2a4acceca779a8a8b':
  Use prebuilt flex.
2014-05-06 18:43:28 +00:00
Ying Wang
a37550edd3 Merge "Use prebuilt flex." 2014-05-06 18:41:00 +00:00
Ying Wang
e9dd544dfe am 889a93a4: Merge "add silvermont x86 architecture"
* commit '889a93a49582fa17049f0424af3c1c06f70db407':
  add silvermont x86 architecture
2014-05-06 16:20:51 +00:00
Ying Wang
889a93a495 Merge "add silvermont x86 architecture" 2014-05-06 16:18:56 +00:00
Ying Wang
2c32044d95 am b7e0bdc0: Merge "Increase system image size of generic_x86_64 to 750MB."
* commit 'b7e0bdc02be3c505c72d431c1addd42016d0a7fc':
  Increase system image size of generic_x86_64 to 750MB.
2014-05-06 02:03:55 +00:00
Ying Wang
b7e0bdc02b Merge "Increase system image size of generic_x86_64 to 750MB." 2014-05-06 02:01:58 +00:00
Ying Wang
ff4aa89db8 Increase system image size of generic_x86_64 to 750MB.
Change-Id: I0c3264c7f629bc4d8c30539590de00967188807b
2014-05-05 19:01:28 -07:00
Ying Wang
fb1236a9a8 Use prebuilt flex.
Bug: 14446414
Change-Id: I07fe8d7f246de853e5bae17286834268e36d260c
2014-05-05 18:34:57 -07:00
Colin Cross
9150a90daf am 5128237a: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
* commit '5128237ad3312523c5a1390efce33ad77f0f2ff0':
  build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
2014-05-05 23:05:14 +00:00
Colin Cross
5128237ad3 Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config" 2014-05-05 23:02:45 +00:00
Colin Cross
772c216e71 build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
Set TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS,
TARGET_PREFERS_32_BIT_APPS is enough to get apps to build for
32-bit only, and leaving TARGET_SUPPORTS_64_BIT_APPS unset
confuses zygote64 because it finds an empty 64-bit ABI list.

Change-Id: Iadea7f2b42c216710b54aeac6011a4e30e0f2eaa
2014-05-05 15:25:41 -07:00
Colin Cross
735628e8d1 am 2ff8919d: Merge changes I7e809264,I504cea21,Ibd2165e6
* commit '2ff8919de339209412d9da2a524f566dfcf5847f':
  build: add core_64_bit.mk
  build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
  build: split TARGET_PREFER_32_BIT for apps and executables
2014-05-05 20:14:18 +00:00
Colin Cross
2ff8919de3 Merge changes I7e809264,I504cea21,Ibd2165e6
* changes:
  build: add core_64_bit.mk
  build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
  build: split TARGET_PREFER_32_BIT for apps and executables
2014-05-05 20:11:28 +00:00
Ying Wang
54a570bd1d am 57df0c7b: Merge "Increase system image size of generic_x86_64 to 650MB."
* commit '57df0c7bf5a78b1c4edb7e06d22ccc91ad46b41d':
  Increase system image size of generic_x86_64 to 650MB.
2014-05-05 18:41:32 +00:00
Ying Wang
57df0c7bf5 Merge "Increase system image size of generic_x86_64 to 650MB." 2014-05-05 18:37:29 +00:00
Ying Wang
edf99a23ee Increase system image size of generic_x86_64 to 650MB.
Change-Id: Iacf6dcd00d78039d1b19595db6f293f8f202ac5a
2014-05-05 11:34:30 -07:00
Tim Murray
6ac74e6d81 am d720c5a2: Merge "Add -no-integrated-as for ARM64."
* commit 'd720c5a2a6cb44e76c20f96d33b0ac8a96060d91':
  Add -no-integrated-as for ARM64.
2014-05-02 18:24:20 +00:00
Tim Murray
d720c5a2a6 Merge "Add -no-integrated-as for ARM64." 2014-05-02 18:21:34 +00:00
Ying Wang
887a52d022 am a6b8025a: Merge "Add WITH_DEXPREOPT to the list of protected global variables."
* commit 'a6b8025a815cc5c9b441a91917f100486c270446':
  Add WITH_DEXPREOPT to the list of protected global variables.
2014-05-02 04:00:30 +00:00
Ying Wang
a6b8025a81 Merge "Add WITH_DEXPREOPT to the list of protected global variables." 2014-05-02 03:57:33 +00:00
Ying Wang
9c44021535 Add WITH_DEXPREOPT to the list of protected global variables.
Bug: 14380196
Change-Id: I02cff39eeaf2deddf434c0c310063e4b341edd43
2014-05-01 20:55:30 -07:00