p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,632 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

7632 Commits

Author SHA1 Message Date
Jing Yu 0c13efb418 Merge "Point arm toolchain to the new gcc-4.6 one." 2012-01-06 20:29:15 -08:00
The Android Open Source Project fad6b161f4 am 2921f03d: Reconcile with ics-mr1-release 
* commit '2921f03d716f2aeb52712a81faaf7dfb597d0826':
  IMM06
 2012-01-06 18:16:25 -08:00
The Android Open Source Project 2921f03d71 Reconcile with ics-mr1-release 
Change-Id: I6903bc47ab690fd56612f4e0e6289bf7a9799dca
 2012-01-06 18:14:56 -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 9caacbd743 am 5ea72eff: Use the new location of the emulator kernel 
* commit '5ea72effbd944891708d2d6fb61055830e617701':
  Use the new location of the emulator kernel
 2012-01-06 17:37:02 -08:00
Jean-Baptiste Queru 5ea72effbd Use the new location of the emulator kernel 2012-01-06 17:02:24 -08:00
The Android Automerger 110ddac4a5 IMM06 2012-01-06 16:34:51 -08:00
The Android Automerger adfb341695 merge in ics-mr1-release history after reset to ics-mr1 2012-01-06 16:31:06 -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 da1c81abe4 am a230c4d0: Reference kernel notice in the new location 
* commit 'a230c4d049258915f6614e7a3fadc2dcfec3e160':
  Reference kernel notice in the new location
 2012-01-06 15:18:21 -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
Steve Block c0b74df335 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I817c12b1e97bee598097d02c70d509f7ab70576a
 2012-01-05 23:28:01 +00:00
Steve Block e8646c237f Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 2012-01-05 14:08:39 -08:00
Jeff Davidson 3203891750 Add hm/hmm/hmmm command. 
Everyone always mixes up m/mm/mmm and may not know about the "help"
command; this seems to be a nice way to remind yourself. :)

Change-Id: I009c7f7891768a8605c06e8d16384a812e607438
 2012-01-05 13:19:21 -08:00
The Android Open Source Project 354e4edb16 am 943f9a58: Reconcile with ics-mr1-release 
* commit '943f9a58a3eb3240c8a85efa49a25a77282f5d48':
  IMM04
 2012-01-05 12:08:33 -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
Ed Heyl d35babb2a6 am 6a203293: Merge commit \'9a46327e\' into ics-mr1-plus-aosp 
* commit '6a203293681df031b6a47f2f189d4d9d44d18576':
  increment version to 4.0.4
 2012-01-05 12:08:27 -08:00
The Android Open Source Project 943f9a58a3 Reconcile with ics-mr1-release 
Change-Id: Iaa3637a3db5b9f2c8c4721a8ea2cb230336753f5
 2012-01-05 07:45:15 -08:00
Al Sutton 1964c8ed2d am d8765f0f: am 80cfc37d: Partial fix for emulator under Lion. 
* commit 'd8765f0f843e78c691c77264619125954d710b1a':
  Partial fix for emulator under Lion.
 2012-01-04 20:41:53 -08:00
Al Sutton d8765f0f84 am 80cfc37d: Partial fix for emulator under Lion. 
* commit '80cfc37d0f0ddbb7db09b7662b84e816ab409537':
  Partial fix for emulator under Lion.
 2012-01-04 20:40:35 -08:00
The Android Automerger ee0472e8a5 IMM04 2012-01-04 16:45:21 -08:00
Ed Heyl 6a20329368 Merge commit '9a46327e' into ics-mr1-plus-aosp 2012-01-04 16:42:14 -08:00
The Android Automerger 4f7927364a merge in ics-mr1-release history after reset to ics-mr1 2012-01-04 16:41:01 -08:00
Ed Heyl 9a46327e12 increment version to 4.0.4 
Change-Id: I156516aedb714f589bd0ae2d39bc9e273b775276
 2012-01-04 16:34:18 -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
Steve Block 934443b275 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: I02566a8d55d7f8845bcc11925b90b2dac4342e63
 2012-01-04 20:07:45 +00:00
Steve Block 15fab1aa8c Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I9281fd27af8c6ec29ebdca60b22f6c9d5ff8deed
 2012-01-03 22:37:53 +00: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
Conley Owens fd3e1f9bf1 am f3c068db: (-s ours) am d38c870d: Get build system to work with Make 3.82 
* commit 'f3c068db26fd1c862f06423714aadf75bf45136b':
  Get build system to work with Make 3.82
 2011-12-27 10:28:10 -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 f3c068db26 am d38c870d: Get build system to work with Make 3.82 
* commit 'd38c870d2e168b051692b20ade0fc966c9e2daf7':
  Get build system to work with Make 3.82
 2011-12-22 16:52:42 -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
Al Sutton 657aeac842 am 9ce06f11: Don\'t run ranlib on MacOS 10.7 
* commit '9ce06f11d69f5154843c234fe0624f9e70d39359':
  Don't run ranlib on MacOS 10.7
 2011-12-21 16:45:21 -08:00
Atte Peltomaki 05e98055fd am 60fe963c: build: explicitly define dependency files 
* commit '60fe963c63c1b98255ad1cf40573b81b5d90d9c3':
  build: explicitly define dependency files
 2011-12-21 16:45:20 -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