Commit graph

2040 commits

Author SHA1 Message Date
Ying Wang
b4c2a64040 Set install name with absolute path for Mac host shared libraries.
Before this change, path of the install name is relative to the top dir.
That means you can execute dynamically-linked binaries only in the top dir.
With this change, you can execute dynamically-linked binaries anywhere.

Change-Id: I1c6441579ffb68505ea678296aceb2e66a6df1be
2012-01-31 21:04:25 -08:00
Wink Saville
8d5610cd1b Merge "Increase java heap size." 2012-01-30 15:42:28 -08:00
Wink Saville
29b3afaf79 Increase java heap size.
I got an Out of memory while compiling, Andreas Huber suggested that
increasing the heap size, which worked.

Change-Id: Id8293ef100ef814b0fe13aa6e1b891a36a2ee853
2012-01-30 15:30:10 -08:00
Ying Wang
707328a3ef Build should fail if any proto file fails compiling
When compile multipling proto files to Java in a for loop.

Change-Id: Ie6a9d3972401b0ad6406bf911db916fcbf88037b
2012-01-30 11:56:07 -08:00
Raphael Moll
347f305181 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

Change-Id: Id6178b000c464c989da2c7f22977986a60de1f44
2012-01-26 15:11:46 -08:00
Dianne Hackborn
512ce9cb42 You know back when I said this thing about Ice Cream Sandwich MR2?
What was I thinking?

That would be *ridiculous*.

What sane person would come up with a release like that?!?

I mean...  four words!  Six if you try to say it!  Insane!!

Instead, we shall call you:

Jelly Bean.

Yum.

Change-Id: Ice28fc17b7eb77cf6b708958161339890234d1d8
2012-01-25 11:21:37 -08:00
Ying Wang
fcf246c989 Workaround for lack of "-Wl,--whole-archive" in MacOS's linker.
Change-Id: I2b1de0a253d341bcb7ee05fdc96bdc0d0967985e
2012-01-20 12:59:58 -08:00
Ying Wang
df2b4b3aab Compute TARGET_TOOLCHAIN_ROOT from TARGET_TOOLS_PREFIX.
Sometimes TARGET_TOOLS_PREFIX is passed in as command line makefile
variable or environmental variable without TARGET_TOOLCHAIN_ROOT.
This change computes TARGET_TOOLCHAIN_ROOT from TARGET_TOOLS_PREFIX in
that case.

Change-Id: I0a37dc1f4d1e3e1951faeffd5e9f926f0a6614dd
2012-01-12 16:38:17 -08:00
Brian Muramatsu
777e86a025 Merge "Avoid Rebuilding Core and VMTest Descriptions" 2012-01-11 11:32:17 -08:00
Jean-Baptiste Queru
3b1dbe9302 Merge "Revert "Reference new location of SDK toolchain"" 2012-01-11 09:04:25 -08:00
Jean-Baptiste Queru
d75dbec617 Revert "Reference new location of SDK toolchain"
This reverts commit 1b834c6660.
2012-01-11 09:00:41 -08:00
Conley Owens
b5370bc4cb Merge "Add a module_path_check for vendor files" 2012-01-11 08:36:23 -08:00
Jean-Baptiste Queru
b6737c1366 Merge "Reference new location of SDK toolchain" 2012-01-11 06:36:55 -08:00
Jean-Baptiste Queru
cb8f66305c Revert "Point arm toolchain to the new gcc-4.6 one."
This reverts commit 1f87795eef.
2012-01-11 04:23:06 -08:00
Conley Owens
8e0f7129fa Add a module_path_check for vendor files
When this is enabled we ensure that files from the vendor directory
get installed to /system/vendor/* instead of elsewhere in /system/*.

This changes the PRODUCT_RESTRICT_VENDOR_FILES variable
to accept "owner", "path", "owner path", or "all".
"true" will still only enforce vendor file owner restrictions.

Change-Id: I4598130a590ad56976e011f4cb2a9f5f227d5732
2012-01-10 15:45:40 -08:00
Jean-Baptiste Queru
1b834c6660 Reference new location of SDK toolchain
Change-Id: If470d742a92061006d94b72f21df5c642348e179
2012-01-09 15:07:59 -08:00
Jean-Baptiste Queru
ea91f0a40e Reference x86 toolchain in its new location
Change-Id: I990b03107d1596a87a8d4cea6973735c60db4c64
2012-01-09 13:02:03 -08:00
Ying Wang
71b5cc1b8e Reference the new prebuilt ccache location.
Change-Id: I4450a8254fe82ed3a670ce653f49381d9c075c8e
2012-01-09 11:52:23 -08:00
Jing Yu
0c13efb418 Merge "Point arm toolchain to the new gcc-4.6 one." 2012-01-06 20:29:15 -08:00
Jean-Baptiste Queru
8f8624e61f am 9caacbd7: am 5ea72eff: Use the new location of the emulator kernel
* commit '9caacbd74328624dfc753cecfc42cb29bf14bfad':
  Use the new location of the emulator kernel
2012-01-06 17:41:07 -08:00
Jean-Baptiste Queru
5ea72effbd Use the new location of the emulator kernel 2012-01-06 17:02:24 -08:00
Jean-Baptiste Queru
7353e43b85 am da1c81ab: am a230c4d0: Reference kernel notice in the new location
* commit 'da1c81abe48c76f59953fd2e14a2ae2283d7bf92':
  Reference kernel notice in the new location
2012-01-06 15:22:50 -08:00
Jean-Baptiste Queru
a230c4d049 Reference kernel notice in the new location 2012-01-06 15:05:53 -08:00
Jing Yu
1f87795eef Point arm toolchain to the new gcc-4.6 one.
Tested build mysid-eng, sojus-eng, trygon-eng, yakju-eng.

Change-Id: I742cf9fcf2407b9098c99136d67161ecf062ac01

Conflicts:

	core/combo/TARGET_linux-arm.mk
2012-01-06 14:14:06 -08:00
Ying Wang
c7a10ddd31 Include toolchain makefile based on the current config.
So we can have the same set of module names in different host arch
/ toolchain version combinations.

Change-Id: Iec66584bf3de92aedd71a59f9dbe74b6ed025b2e
2012-01-06 11:59:30 -08:00
Brian Muramatsu
c0a6924101 Avoid Rebuilding Core and VMTest Descriptions
Only generate the core test and vmtest descriptions when something has
actually changed rather than everytime CTS is built. This should make
iterative test development in CTS more pleasant.

The rule targets are changed to be the paths of the test description
XML files in a separate directory outside of the CTS distribution.
The buildCts.py rule copies these XMLs when they change to the
final CTS distribution location and creates the final plan file.

The dependencies have also been changed to reply upon the full
package paths rather than their phony targets to avoid rebuilding
everything all the time.

Finally, the AppSecurity rule was removed, because I have taken
care of that in my prior change to the Makefiles in the CTS
project.

Change-Id: I88b92c7a4cb4c2c2e20f06641e7ba0604d37f805
2012-01-05 18:44:16 -08:00
Al Sutton
f79ce15891 am 1964c8ed: am d8765f0f: am 80cfc37d: Partial fix for emulator under Lion.
* commit '1964c8ed2d6b1981ee991b5ecd95ab711affdf62':
  Partial fix for emulator under Lion.
2012-01-05 12:08:29 -08:00
Al Sutton
80cfc37d0f Partial fix for emulator under Lion.
Don't use -Wl,-dynamic on Lion
2012-01-04 15:16:50 -08:00
Ying Wang
aaa8f06fe3 Default LOCAL_SDK_RES_VERSION to LOCAL_SDK_VERSION
in static_java_library.mk.

Change-Id: I25ad47fea0fdb10c8aa0a0cb0d4c5ed117cd76ef
2012-01-03 11:52:26 -08:00
Jean-Baptiste Queru
89fbc541ad Add CSR to the list of known vendors
Change-Id: I978569e1be4c9d1d52d2b7fb7de2da4d4f616f39
2011-12-28 15:42:40 -08:00
Ying Wang
29b6918fdd Remove the restriction that PHONY_PACKAGE needs LOCAL_REQUIRED_MODULES
Change-Id: I33e776ea80368e0f0290169e680689a680186ed6
2011-12-22 17:51:28 -08:00
Conley Owens
d38c870d2e Get build system to work with Make 3.82
Note: `sort` can't seem to handle newlines in 3.82.

Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
2011-12-22 15:16:05 -08:00
Conley Owens
015c7885e0 Merge "Get build system to work with Make 3.82" 2011-12-22 15:14:01 -08:00
Tor Norbye
4630c32189 Merge "Make asm-3.1 an optional module, remove from grandfathered list" 2011-12-22 12:13:15 -08:00
Conley Owens
d7a1a9b49b Get build system to work with Make 3.82
Note: `sort` can't seem to handle newlines in 3.82.

Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
2011-12-22 09:56:18 -08:00
Ying Wang
4c54b9fa2a We should include factory ramdisk if one shot makefile is NOT defined.
Change-Id: I711dbfb0d98a5e8a4d784d3ee6f3f9cfdc926209
2011-12-21 18:59:40 -08:00
Al Sutton
a4f5991486 am 657aeac8: am 9ce06f11: Don\'t run ranlib on MacOS 10.7
* commit '657aeac8423d9e3cd31c0dffcecaad78a53d7604':
  Don't run ranlib on MacOS 10.7
2011-12-21 16:46:37 -08:00
Atte Peltomaki
5846050fd4 am 05e98055: am 60fe963c: build: explicitly define dependency files
* commit '05e98055fdb1d48bac80790cb719838598b687e8':
  build: explicitly define dependency files
2011-12-21 16:46:36 -08:00
Ying Wang
c26f4d3904 Merge "Disable factory ramdisk if build with mm/mmm" 2011-12-21 16:24:43 -08:00
Ying Wang
9f0e3c9658 Disable factory ramdisk if build with mm/mmm
Because factory ramdisk build depends on the global view of all modules.

Change-Id: I5b35821cd287b70702191f3c30be6735d3339544
2011-12-21 16:24:30 -08:00
Raphael
fe927e18a6 Merge "Allow make 3.82 to be used under Cygwin 1.7" 2011-12-21 15:02:44 -08:00
Raphael
d44d54a0d9 Merge "Add 2 SDK directories that can build under Cygwin/Mingw" 2011-12-21 15:02:38 -08:00
Ying Wang
931a099a4c Fix multiple modules with the same name in FACTORY_RAMDISK_MODULES
With this change, if a module name is associated with multiple modules,
you can specify multiple install paths in
PRODUCT_FACTORY_RAMDISK_MODULES.
For example, if we have 2 modules named "foo", one is Java library and
the other is executable, then you can write:
PRODUCT_FACTORY_RAMDISK_MODULES += \
  foo:system/bin/foo:system/framework/foo.jar
Or:
PRODUCT_FACTORY_RAMDISK_MODULES += \
  foo:system/bin/foo \
  foo:system/framework/foo.jar

The build system will choose the correct built files based on the
install paths.

Change-Id: I6efc72e8abd1e81710ada16731b6792989aefd85
2011-12-21 13:50:06 -08:00
Al Sutton
9ce06f11d6 Don't run ranlib on MacOS 10.7
Change-Id: I74f4623e6044dd804669aaa70c6e410fa8988d75
2011-12-21 13:12:33 -08:00
Atte Peltomaki
60fe963c63 build: explicitly define dependency files
Groundwork for distcc support in Android build system,
see distcc FAQ for details on why -MF is needed:
http://distcc.googlecode.com/svn/trunk/doc/web/faq.html
2011-12-21 09:24:09 -08:00
Ying Wang
0d75a0a54c Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULES
If there is shared library with the same name.

Change-Id: Iaa43219cab7737c02a79d168f13ad4c473421f24
2011-12-20 17:36:26 -08:00
Raphael
76bf62d75e Allow make 3.82 to be used under Cygwin 1.7
OTOH, should we just allow the expression to be >= 3.81
for all platforms? For cygwin it's a specific case since
we don't build the platform, only a handful set of tools
and it works just fine with a newer make 3.82.

Change-Id: Icff0d0e13bce79f7164007985f14db56e9049552
2011-12-19 13:39:51 -08:00
Raphael
0ae6d29568 Add 2 SDK directories that can build under Cygwin/Mingw
Change-Id: I020c2691d7d92a48bd406360e2752357ae79e3b0
2011-12-19 13:39:43 -08:00
Bruce Beare
cf0b20413e am b056d71f: If setupwizard is disabled, don\'t force it to optional
* commit 'b056d71f79b717fb36d375e48c19509900f977d3':
  If setupwizard is disabled, don't force it to optional
2011-12-19 11:38:37 -08:00
Bruce Beare
b056d71f79 If setupwizard is disabled, don't force it to optional
Change-Id: I15912ed77b88ea94feb149fdd081a309e3cf4678
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-12-19 09:51:40 -08:00