Commit Graph

16133 Commits

Author SHA1 Message Date
Ying Wang af3f1a5454 am d6214b31: am 0d4b3df6: Merge "Target "tests" now only builds the modules tagged as "tests""
* commit 'd6214b3161161faf63a60b3ad3f595569a481192':
  Target "tests" now only builds the modules tagged as "tests"
2014-05-09 00:10:43 +00:00
Ying Wang 1ba08f6b7c am 2d41656c: am f6603f75: Merge "Add tool to package up built modules."
* commit '2d41656cdb41853e42a7ea2c0597ce505ef51750':
  Add tool to package up built modules.
2014-05-09 00:10:43 +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 c0d50f6295 am 5bd1da1e: am 41d8760d: Merge "Bump userdata image size from 200 MB to 550 MB"
* commit '5bd1da1e0e9dff444f98fb1b2e2954663041198f':
  Bump userdata image size from 200 MB to 550 MB
2014-05-08 23:01:48 +00: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 676c8f0450 am 4ed19f0f: am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"
* commit '4ed19f0f4294544d0447025f0079a9d9e185a495':
  Add dalvik.vm.dex2oat-flags for eng build
2014-05-08 21:57:32 +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 af93afcec9 am 0a61a603: am 3b15cdb8: Merge "Apply LOCAL_LDLIBS to target build rules too."
* commit '0a61a6032ccfe5b26395da1a0a9512957797fa69':
  Apply LOCAL_LDLIBS to target build rules too.
2014-05-08 00:27:03 +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 ccd6223f56 am ba0bb801: am a16583a0: Merge "Fix windows/mingw build."
* commit 'ba0bb801c3cfee582e454432e6a0a75491e54236':
  Fix windows/mingw build.
2014-05-06 19:19:15 +00: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 bf4cdb49a3 am c3b2314a: am a37550ed: Merge "Use prebuilt flex."
* commit 'c3b2314a58e8d6f90766db2ef82303bafcefb766':
  Use prebuilt flex.
2014-05-06 18:46:10 +00: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 9c7393b87a am e9dd544d: am 889a93a4: Merge "add silvermont x86 architecture"
* commit 'e9dd544dfed3a974d2bb2e6f783238ecfe64fb6c':
  add silvermont x86 architecture
2014-05-06 16:24:30 +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 876dca695d am 2c32044d: am b7e0bdc0: Merge "Increase system image size of generic_x86_64 to 750MB."
* commit '2c32044d95501b376cd8f912b28c957accfb1873':
  Increase system image size of generic_x86_64 to 750MB.
2014-05-06 02:05:46 +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 40aabbeeac am 9150a90d: am 5128237a: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
* commit '9150a90dafd6554519d41e5efffeb501268cf8de':
  build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
2014-05-05 23:09:04 +00: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 6f9166640a am 735628e8: am 2ff8919d: Merge changes I7e809264,I504cea21,Ibd2165e6
* commit '735628e8d19fae51574bd5057c142db56797a2b0':
  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:18:09 +00: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 0049c40efd am 54a570bd: am 57df0c7b: Merge "Increase system image size of generic_x86_64 to 650MB."
* commit '54a570bd1da36041124965110f4d2d1206558c82':
  Increase system image size of generic_x86_64 to 650MB.
2014-05-05 18:45:57 +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
Justin Koh 007f8c804f am 0e35df2a: Add ContactsProvider to core_tiny.
* commit '0e35df2a7c77a6308106fa9a48f90c4729b9b8f3':
  Add ContactsProvider to core_tiny.
2014-05-05 17:46:55 +00:00
Justin Koh 0e35df2a7c Add ContactsProvider to core_tiny.
Add ContactsProvider to core_tiny: this is necessary to pass CTS.

Change-Id: I159109740f329e5c540ffb6f1cd1b1a7f9429d86
2014-05-04 16:31:02 -07:00
Dirk Dougherty d19aa4bae2 am 611d7e14: am 379d9968: am e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit '611d7e14e87d030cd5d89b932a1877289ab68e8d':
  Merge changes from templates-sdk to templates-sdk-dyn.
2014-05-02 22:58:02 +00:00