Commit Graph

2118 Commits

Author SHA1 Message Date
Mike Lockwood
1c06bc778c Merge commit '7d2ba7c' 2012-03-21 17:08:21 -07:00
Mike Lockwood
e8eb8df989 Merge commit 'c6e952f'
Don't build userdata.img for tests build.

Change-Id: I492cca5e5989cabdeb6f75c3b8a8c9ac3b9ca8c8
2012-03-21 17:01:18 -07:00
Steve Block
34268ebd69 Merge "Add a comment about publishing licenses for third-party code" 2012-03-21 10:17:46 -07:00
Steve Block
d14d3b4e64 Add a comment about publishing licenses for third-party code
Change-Id: I21bee0bb78ab42b4f7b6a938f94653c7e21e8503
2012-03-21 17:05:11 +00:00
Doug Zongker
2c4dc95767 Merge "optional cross-check between OTA radio images and board-info.txt" 2012-03-21 09:47:25 -07:00
Doug Zongker
9296f09277 optional cross-check between OTA radio images and board-info.txt
Adds a python script which checks the version of each radio image
added with the new add-radio-file-checked macro against a file
containing sha-1 -> version string mappings and the contents of
board-info.txt, so that the build can fail if board-info.txt and the
OTA images are out of sync.

Change-Id: Icb61dc2adefc240ced9059941582c23b629089c0
2012-03-21 09:18:15 -07:00
Ying Wang
d4a41953fe am 0187511e: am 4243532d: am 301843ae: am 29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '0187511e70960618ac5c84f1446ec955ba6c8955':
  Fix for "dexopt: No such file or directory" error
2012-03-20 19:36:30 -07:00
Ying Wang
301843ae3e am 29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '29e44b7a8300644516b021e9e324ffe426098b3f':
  Fix for "dexopt: No such file or directory" error
2012-03-20 15:20:14 -07:00
Ying Wang
29e44b7a83 Merge "Fix for "dexopt: No such file or directory" error" 2012-03-20 11:05:56 -07:00
Dima Zavin
992a52990c core: the device/board/product kernel headers will be auto-generated
So, just add the output include directory to the include path

Change-Id: Ia370454237913a748288124f65a6b731b17d6e1a
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-19 12:32:08 -07:00
Dima Zavin
f926990ba3 core: allow product to provide kernel headers as well
This is useful when a device inherits from an architecture
product, such as omap4.mk. The architecture specific product
can provide kernel headers to all the devices that use
that architecture.

Change-Id: I0c9d3120a6089fb535a3fa8eccf10775a271cd21
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-19 12:32:08 -07:00
Keun young Park
59c2136e1b Merge "rename pdk builds: pdk1 to pdk_eng, pdk2 to pdk_rel" 2012-03-16 12:35:40 -07:00
Dima Zavin
4e16f96dbd core: allow devices to provide their own device specific kernel headers
Currently, we need to pollute the common bionic/libc/kernel/...
directory with device specific kernel headers. This has created a giant
dumping ground of headers from all the projects we have ever done.

Allow each device to provide their own headers and thus eventually allow
bionic/libc/kernel to become *just* the common linux kernel headers.

This change will automatically add device/oem/name/kernel-headers to
the include list and also allow the BoardConfig.mk to specify
additional directories with TARGET_BOARD_KERNEL_HEADERS variable.
The requirement is that the final dir name must be kernel-headers to
mark explicitly where kernel headers are kept.

Change-Id: I7d32a979eef1f464db06c1bc448a04ddc3575efd
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-15 13:22:48 -07:00
Keun young Park
9ec15ec89c rename pdk builds: pdk1 to pdk_eng, pdk2 to pdk_rel
Change-Id: Iadf0493b1f6700638010ceb50ced2fe7bc8bb603
2012-03-15 12:23:05 -07:00
Glenn Kasten
a00ba58646 Merge "Use pathmap.mk for system/media includes" 2012-03-14 16:42:17 -07:00
Glenn Kasten
fefc17ff59 Use pathmap.mk for system/media includes
Currently these point to the old location.
Another CL will move them to the new location.

Change-Id: I61dd732981a9a7a3f4a2c1cc01dc072f4fb6a2b8
2012-03-14 15:30:37 -07:00
Ying Wang
bf69aa32c9 Fix tests build.
Use the conditional only after the tests build variant is phased out.

Change-Id: Ide691700dda4bbf56c6f81f923d1b8c5eb196b85
2012-03-13 19:49:59 -07:00
Ying Wang
30e8093f5f Merge "Add build goal "tests"." 2012-03-13 19:13:19 -07:00
Ying Wang
160b670f4a Add build goal "tests".
Bug: 5368571
The phony build goal "tests" will eventually replace the build variant
tests.

Change-Id: Ia656f2cf2260feeaa8fa32e9221b7f9ce0990262
2012-03-13 19:12:21 -07:00
Andrew Hsieh
cd1b924e37 Merge "Point to new linux prebuilt toolchain for SDK build" 2012-03-13 15:48:21 -07:00
Ying Wang
bdbbd2062c Merge "Remove system partition files from the test zip file." 2012-03-13 13:00:46 -07:00
Ying Wang
c5f049799c Remove system partition files from the test zip file.
Bug: 6157562
Change-Id: I581c6db7d47b42617f8ef6097ccd0aae52c7e1b4
2012-03-13 11:22:04 -07:00
Andrew Hsieh
0e63fd37dd Point to new linux prebuilt toolchain for SDK build
Change-Id: I21849119b0f3f45f950e9e6d1da0833aff381fb7
2012-03-13 02:17:35 -07:00
Svetoslav Ganov
49932f1edb Adding clean variables for some variables used in CTS.
1. A CTS package can specify the test runner used to launch
   its tests from the device. This is useful for preparing
   and cleaning the device through some shell commands if
   necessary.

bug:5946699

Change-Id: Ib1d6454c4274b1c37323235c9b3a195f3b9d8131
2012-03-12 19:56:05 -07:00
Keun young Park
519316e568 Fix build caused by 168380
Change-Id: Iebda5669f48fe505146b8f2f8b35d06621d4b0e6
2012-03-12 12:10:42 -07:00
Keun young Park
7fc7aad152 changes to add pdk1 / pdk2 build for PDK build
- additional files will be added to pdk/build
Bug: 6079146

Change-Id: Ieb5fcab8002193250d770b923f60ec7333ce84e5
2012-03-12 11:49:34 -07:00
Mathias Agopian
a1af38d9b3 Merge "update include paths to new location" 2012-03-08 14:45:34 -08:00
Mathias Agopian
a7c674b141 Merge "add frameworks/native include paths" 2012-03-08 14:45:28 -08:00
Ying Wang
11a7e126e5 Merge "Update llvm-rs-cc build to use unified headers in all cases." 2012-03-07 16:00:27 -08:00
Stephen Hines
5a4eb5f0f8 Update llvm-rs-cc build to use unified headers in all cases.
Change-Id: I66a2cc5f762b7d170f4bfc6c88f8c7df11be4f4b
2012-03-07 15:59:05 -08:00
Mathias Agopian
fb956ef9cc update include paths to new location
Change-Id: I13dfa74f35ee778615cdb9459fc2e18bc37d62a1
2012-03-05 18:45:37 -08:00
Mathias Agopian
6d40595e53 Merge "add a name for opengl tests include paths" 2012-03-05 16:08:15 -08:00
Mathias Agopian
bd118e684d add frameworks/native include paths
Change-Id: I1ede8075dc77f77f5a9bc4a53663d4a74842ab36
2012-03-05 16:04:31 -08:00
Mathias Agopian
cdcea7a83d add a name for opengl tests include paths
Change-Id: I4fd30376bcc9549da9391cde99b884eab305d5dd
2012-03-05 16:01:41 -08:00
Brian Muramatsu
23bb696870 Merge "Include CTS Build Rules" 2012-03-02 15:13:04 -08:00
Brian Muramatsu
7314933ac7 Include CTS Build Rules
Change-Id: Ieacee8ff6215b22222ea9ea6a1e62fce62daad77
2012-03-02 14:37:08 -08:00
Raphael Moll
3ab307a68c SDK: Also read sdk/build/tools.OS.atree
This allows us to have per-host OS (or OS + arch) atree files in case we
need to get tools which source varies per host OS, example:
- sdk/build/tools.linux.atree
- sdk/build/tools.linux-x86_64.atree
- sdk/build/tools.windows.atree
etc.

Change-Id: I9a1256548345fb866b0750fce6810913413dd946
2012-03-02 12:40:04 -08:00
Andrew Hsieh
ed6b815505 BUILD_HOST_64bit=1 to build host tools in 64-bit
By default we build tool in 32-bit.  This flag allow individual tool and its
dependencies to be built in 64-bit (eg. Emulator).  Fixes to resolve 64-bit
porting issues (in other git) will be submitted seperately.

Change-Id: I486cf7ddac727d3c374ed890857d497c3a69e598
2012-02-28 10:24:39 -08:00
Jean-Baptiste Queru
418027c87a am 41ab528f: am 99505268: am 20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."
* commit '41ab528fe3533847fecddb0c6ee7884b17f35279':
  Issue warning when "make snod" with dexpreopt enabled.
2012-02-24 11:38:53 -08:00
Jean-Baptiste Queru
9950526875 am 20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."
* commit '20b970e25227c4144c61d0d6108905616dc4f08b':
  Issue warning when "make snod" with dexpreopt enabled.
2012-02-24 11:32:08 -08:00
Ying Wang
acf01ec837 Issue warning when "make snod" with dexpreopt enabled.
Change-Id: I481f963634dd384ed6d3de73dfeeda92b37d227e
2012-02-24 11:05:48 -08:00
Ying Wang
92ca609cd1 Fix bug with the HOST_AR.
Change-Id: I28ab86d3b6e7cbd4391e2640cf8e2be269b03e76
2012-02-23 16:27:43 -08:00
Kenny Root
e27e41b19d Merge "Enable TLS register by default for ARMv7a arch" 2012-02-21 12:52:12 -08:00
Kenny Root
87f4d5a926 Enable TLS register by default for ARMv7a arch
Everything that is based on ARMv7a should have a cp15 TLS register.
Enable it by default so it's not accidentally missed in newer board
configurations. In fact, this could be enabled for ARMv6 as well, but we
currently don't distinguish between ARMv5 and ARMv6 in the build system.

This can still be disabled by setting it to "false" in the board
configuration, but this shouldn't ever be needed.

Change-Id: Ic2918f32899c8bcfa482f92c98f5a192fa318470
2012-02-21 09:17:18 -08:00
Scott Anderson
026c62e028 Merge "Remove simg2img from user_tags.mk" 2012-02-17 11:24:01 -08:00
Svetoslav Ganov
9869c5e409 Merge "Adding shell commands for manipulating content via content providers." 2012-02-16 13:07:50 -08:00
Scott Anderson
9986e1a220 Remove simg2img from user_tags.mk
Change-Id: Ibc0d6cacd25b343424cecce63fb1cd9c6d714f92
Signed-off-by: Scott Anderson <saa@android.com>
2012-02-15 17:29:56 -08:00
Jean-Baptiste Queru
605643224e Move AOSP to another fake version number
Change-Id: Ida0282d1eccaa2bdaf4ca54aaf82680efdbaa271
2012-02-15 14:04:45 -08:00
Raphael Moll
c04b56c5b0 Merge "Move Windows SDK whitelist out of main.mk"
This replaces the list maintained in build/core/main.mk
by 2 makefiles in sdk.git and development.git.

Pre-requisite CLs: Change Ifa8111dbae for sdk.git
and Change Ie6f728bee for development.git

(cherry-pick of 347f305181)

Change-Id: I6d1f4c974a6425e50e3e287c66a4e8090cf814cb
2012-02-14 11:12:02 -08:00
Elliott Hughes
aeaf48812d Merge "Linker script support for constructor priorities." 2012-02-14 08:31:20 -08:00