Commit graph

887 commits

Author SHA1 Message Date
Jean-Baptiste Queru
130b539bfd am 890ef4b0: a few more existing user modules to be grandfathered in - DO NOT MERGE
Merge commit '890ef4b0aaa602b3f7bcee87bb4d89e6aaa53b48' into gingerbread-plus-aosp

* commit '890ef4b0aaa602b3f7bcee87bb4d89e6aaa53b48':
  a few more existing user modules to be grandfathered in - DO NOT MERGE
2010-09-08 12:21:43 -07:00
Jean-Baptiste Queru
890ef4b0aa a few more existing user modules to be grandfathered in - DO NOT MERGE
Change-Id: I7526ad40f27853a2f83bc0c4c4f80ff709fcaf40
2010-09-08 12:18:17 -07:00
Jean-Baptiste Queru
78a59022f8 a few more grandfathered user tags - DO NOT MERGE
Change-Id: Ia625817d3f332f8760835b3fa20e56c00c305166
2010-09-08 12:12:01 -07:00
Jean-Baptiste Queru
6b747cfb21 am a90f9d2c: Merge "Warn when new modules are found that use user tags - DO NOT MERGE" into gingerbread
Merge commit 'a90f9d2c299d7833b37f8a0e244a2893054d9ea5' into gingerbread-plus-aosp

* commit 'a90f9d2c299d7833b37f8a0e244a2893054d9ea5':
  Warn when new modules are found that use user tags - DO NOT MERGE
2010-09-08 10:32:52 -07:00
Jean-Baptiste Queru
a90f9d2c29 Merge "Warn when new modules are found that use user tags - DO NOT MERGE" into gingerbread 2010-09-08 10:22:48 -07:00
Jean-Baptiste Queru
8f731bb272 am 0545c916: Revert "Allow properties with spaces in their values"
Merge commit '0545c9160d0d3dde4675184609cc7656de5558b0' into gingerbread-plus-aosp

* commit '0545c9160d0d3dde4675184609cc7656de5558b0':
  Revert "Allow properties with spaces in their values"
2010-09-07 10:53:46 -07:00
Jean-Baptiste Queru
0545c9160d Revert "Allow properties with spaces in their values"
This reverts commit de3bfade57.
2010-09-07 10:51:12 -07:00
Ying Wang
30d68a3b9d am 817f07ae: Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
Merge commit '817f07aef008dd3f32fed3603382123917fdec64' into gingerbread-plus-aosp

* commit '817f07aef008dd3f32fed3603382123917fdec64':
  Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
2010-09-07 10:29:34 -07:00
Ying Wang
817f07aef0 Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
Cherry-pick from master.

Change-Id: I0a56e3e91efd53ad2671136b6fe00ee675f56230
2010-09-07 10:26:18 -07:00
Jean-Baptiste Queru
39de432897 Warn when new modules are found that use user tags - DO NOT MERGE
Change-Id: Ia563765f3d0161d7c851a0162d65c2a249b4dd38
2010-09-03 17:39:10 -07:00
Doug Zongker
a4a50996ac am c637db16: remove remaining amend support
Merge commit 'c637db16d83b2c248b1cf0122e2ba558ed95762c' into gingerbread-plus-aosp

* commit 'c637db16d83b2c248b1cf0122e2ba558ed95762c':
  remove remaining amend support
2010-09-03 12:39:15 -07:00
Doug Zongker
c637db16d8 remove remaining amend support
Remove the remaining (unused and untested) support for generating
amend scripts.  This means that you won't be able to OTA directly from
cupcake to gingerbread.

Change-Id: Iaf5295db92a42b336960d05295f48b67cb729337
2010-09-03 11:58:31 -07:00
Joe Onorato
4b1e224585 am c5b8d4ce: Merge "The old clean target had bit rotted." into gingerbread
Merge commit 'c5b8d4ceb63909e5f0811fa80dca205996fd8644' into gingerbread-plus-aosp

* commit 'c5b8d4ceb63909e5f0811fa80dca205996fd8644':
  The old clean target had bit rotted.
2010-09-03 10:28:00 -07:00
Joe Onorato
c5b8d4ceb6 Merge "The old clean target had bit rotted." into gingerbread 2010-09-03 10:26:04 -07:00
Joe Onorato
dfc5e0cb7b The old clean target had bit rotted.
Clean and clobber are now the same thing.

Change-Id: I4873d40496b16e13689e22c48cff1fecdffb8b40
2010-09-03 13:25:11 -04:00
Ying Wang
a79db6e47a am 3dae0ee4: Fix inherited dependency when instrmentation.
Merge commit '3dae0ee46cf5fcde6eb424f9ab0c69f2d901a671' into gingerbread-plus-aosp

* commit '3dae0ee46cf5fcde6eb424f9ab0c69f2d901a671':
  Fix inherited dependency when instrmentation.
2010-09-03 10:21:37 -07:00
Ying Wang
3dae0ee46c Fix inherited dependency when instrmentation.
It turns out we should also LOCAL_INSTRUMENTATION_FOR.
To disambiguate LOCAL_INSTRUMENTATION_FOR_PACKAGE_NAME is renamed to LOCAL_MANIFEST_INSTRUMENTATION_FOR.

Bug: 2902591
Change-Id: I6cb893c135736fc4170aa2259105b4c5eea798a1
2010-09-03 10:05:39 -07:00
Jean-Baptiste Queru
54b8b436a3 am de3bfade: Allow properties with spaces in their values
Merge commit 'de3bfade571033b01fbaccac2f0fdf7193e8d3ee' into gingerbread-plus-aosp

* commit 'de3bfade571033b01fbaccac2f0fdf7193e8d3ee':
  Allow properties with spaces in their values
2010-09-02 17:13:24 -07:00
Jean-Baptiste Queru
de3bfade57 Allow properties with spaces in their values
This way, such properties can be set in product definition files
instead of having to live in system.prop, which eliminates the need
for system.prop

Change-Id: I25d9665f65436df8215940e46380deb31b8161ba
2010-09-02 14:30:56 -07:00
Ying Wang
2e1347c6a0 am fb644881: Disable new longjmp in glibc 2.11 and later.
Merge commit 'fb644881b6083aa0d9d15e7aad8bfa5a429b1c37' into gingerbread-plus-aosp

* commit 'fb644881b6083aa0d9d15e7aad8bfa5a429b1c37':
  Disable new longjmp in glibc 2.11 and later.
2010-09-02 09:45:11 -07:00
Ying Wang
fb644881b6 Disable new longjmp in glibc 2.11 and later.
Bug: 2967937
Change-Id: I4e2a5f806ad45a01ca7f8c4d032cd29fce1d794d
2010-09-01 16:39:11 -07:00
Andreas Huber
aeb2bbc140 am 200f2598: Build without OpenCore by default, remove obsolete opt-in to stagefright.
Merge commit '200f25984ccc8a9e5fc13bfbcde22c17bc80d410' into gingerbread-plus-aosp

* commit '200f25984ccc8a9e5fc13bfbcde22c17bc80d410':
  Build without OpenCore by default, remove obsolete opt-in to stagefright.
2010-08-30 13:06:50 -07:00
Andreas Huber
200f25984c Build without OpenCore by default, remove obsolete opt-in to stagefright.
Change-Id: I6e08d2136147f4e279f8a5b2b3837e4317faf27c
related-to-bug: 2941153
2010-08-30 12:48:03 -07:00
Raphael Moll
2a1873b09c am 6ba4b59c: SDK: add hierarchyviewer2 to windows target list.
Merge commit '6ba4b59c9067b747ab2a4c85621e656c4d4614e3' into gingerbread-plus-aosp

* commit '6ba4b59c9067b747ab2a4c85621e656c4d4614e3':
  SDK: add hierarchyviewer2 to windows target list.
2010-08-28 17:31:31 -07:00
Raphael Moll
6ba4b59c90 SDK: add hierarchyviewer2 to windows target list.
Change-Id: I282173ab10930a716861f3774804d3d8484a71f3
2010-08-28 15:03:40 -07:00
Ying Wang
485bd44d0d am d421f57d: Fix mkyaffs2image extra flags in the release tools.
Merge commit 'd421f57d22009e4d9ce71298c2f93636ff9e7d9d' into gingerbread-plus-aosp

* commit 'd421f57d22009e4d9ce71298c2f93636ff9e7d9d':
  Fix mkyaffs2image extra flags in the release tools.
2010-08-25 21:19:29 -07:00
Ying Wang
d421f57d22 Fix mkyaffs2image extra flags in the release tools.
Change-Id: I806e3e85ef89941edf04352331e25730c491c470
2010-08-25 20:39:41 -07:00
Ying Wang
f11fc5f098 am fb0a347b: Disable building OTA package if there is no kernel.
Merge commit 'fb0a347b747a91173c8a9f845a0362e3f8a9701f' into gingerbread-plus-aosp

* commit 'fb0a347b747a91173c8a9f845a0362e3f8a9701f':
  Disable building OTA package if there is no kernel.
2010-08-25 16:13:08 -07:00
Ying Wang
fb0a347b74 Disable building OTA package if there is no kernel.
Change-Id: I9a10cba92dd7f9cccd8cca58a5fa2d3a8b4620eb
2010-08-25 16:06:06 -07:00
Ying Wang
480250d3ae am 68bb6517: Show command lines run by releasetools.
Merge commit '68bb65177cc6839e985c0a54343f44494de61d62' into gingerbread-plus-aosp

* commit '68bb65177cc6839e985c0a54343f44494de61d62':
  Show command lines run by releasetools.
2010-08-25 15:40:29 -07:00
Ying Wang
68bb65177c Show command lines run by releasetools.
Change-Id: Ic204e6738781c191cd6cefefdb351f8a156b2309
2010-08-25 15:23:21 -07:00
Ying Wang
eed6860d38 am 4de6b5bf: Fix mkbootimg parameters for releasetools.
Merge commit '4de6b5bfc89de95b18514e75329a2ec7491bebbd' into gingerbread-plus-aosp

* commit '4de6b5bfc89de95b18514e75329a2ec7491bebbd':
  Fix mkbootimg parameters for releasetools.
2010-08-25 15:04:45 -07:00
Ying Wang
4de6b5bfc8 Fix mkbootimg parameters for releasetools.
Change-Id: I6192743e9db415f5fe7f3b82081f8a82061254b3
2010-08-25 14:30:17 -07:00
Ying Wang
f3a142b8d5 am 7eaa4dc2: Merge "Link against Mac OSX 10.5 SDK if building on 10.6." into gingerbread
Merge commit '7eaa4dc2fbc3d7b3d8a0a2576a6fc14507e176a8' into gingerbread-plus-aosp

* commit '7eaa4dc2fbc3d7b3d8a0a2576a6fc14507e176a8':
  Link against Mac OSX 10.5 SDK if building on 10.6.
2010-08-25 10:10:13 -07:00
Jean-Baptiste Queru
5f0df7a95b Manual merge
Change-Id: I81dd98ba150e936b675ff2323994a1e381512332
2010-08-25 09:52:07 -07:00
Ying Wang
7eaa4dc2fb Merge "Link against Mac OSX 10.5 SDK if building on 10.6." into gingerbread 2010-08-25 09:32:00 -07:00
Rohit Mungee
cdc1d6f457 am cb92616f: Merge "Add support for multiple html directories to droiddoc." into gingerbread
Merge commit 'cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd' into gingerbread-plus-aosp

* commit 'cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd':
  Add support for multiple html directories to droiddoc.
2010-08-24 23:01:32 -07:00
Rohit Mungee
cb92616f11 Merge "Add support for multiple html directories to droiddoc." into gingerbread 2010-08-24 22:58:30 -07:00
Bill Napier
0e143c0ed9 Add support for multiple html directories to droiddoc.
The goal for adding this support is to allow droiddoc to pull html
files both from the static content and from content generated at
build time.

Change-Id: I5d4b2432aa78b0b3559daacedfb7a29675701f33
2010-08-24 22:16:01 -07:00
Ying Wang
d6683f08c9 Link against Mac OSX 10.5 SDK if building on 10.6.
So that tools built on Snow Leopard (10.6) can be used on Leopard (10.5).

Change-Id: I99745ecbe2ad11feaae31d5be31c34c2e0ad7cc5
2010-08-24 18:34:44 -07:00
Thorsten Glaser
2213aab8b9 Add new variable TARGET_SHELL := ash (default; or mksh)
Besides that, add enough magic to build everything tagged
as "shell_$(TARGET_SHELL)" and permit ash/mksh as not unusual

Change-Id: I36c0590ba49f45251d24dc179cb27c8368c3662a
2010-08-24 18:08:47 -07:00
Ying Wang
2eed660c66 am ffff0028: Pass pagesize to makebootimage.
Merge commit 'ffff0028ae9a83893f71efa370d283e2247bcdd4' into gingerbread-plus-aosp

* commit 'ffff0028ae9a83893f71efa370d283e2247bcdd4':
  Pass pagesize to makebootimage.
2010-08-23 13:52:18 -07:00
Ying Wang
ffff0028ae Pass pagesize to makebootimage.
Change-Id: I719d765245469921de105430fdd92d478ea48e82
2010-08-23 12:56:25 -07:00
Ying Wang
d3b973d897 am 065521be: Backport ext4 support from master [DO NOT MERGE]
Merge commit '065521be4fd6965058fbd599bb43fe13101fee7c' into gingerbread-plus-aosp

* commit '065521be4fd6965058fbd599bb43fe13101fee7c':
  Backport ext4 support from master [DO NOT MERGE]
2010-08-23 11:49:10 -07:00
Ying Wang
065521be4f Backport ext4 support from master [DO NOT MERGE]
ext4 support is needed by crespo.

Change-Id: I604cb9ada526ce8ba6b3648171ac1d614a5519a9
2010-08-23 11:34:40 -07:00
Ying Wang
d4ee2de1c3 am ad3cf5f8: Restore OTA for crespo. [DO NOT MERGE]
Merge commit 'ad3cf5f868fc36de0a4fa501f074d35a94496b27' into gingerbread-plus-aosp

* commit 'ad3cf5f868fc36de0a4fa501f074d35a94496b27':
  Restore OTA for crespo. [DO NOT MERGE]
2010-08-21 17:00:59 -07:00
Ying Wang
ad3cf5f868 Restore OTA for crespo. [DO NOT MERGE]
Change-Id: I2472942741bdb2e4fa5037883f6acbe6c4ca36c3
2010-08-21 16:58:06 -07:00
Jean-Baptiste Queru
ed91928a6c am 60d1ee3e: Better way to disable OTAs for crespo - DO NOT MERGE
Merge commit '60d1ee3e539e02ba701b9ff647fd23aca18f890d' into gingerbread-plus-aosp

* commit '60d1ee3e539e02ba701b9ff647fd23aca18f890d':
  Better way to disable OTAs for crespo - DO NOT MERGE
2010-08-20 19:22:51 -07:00
Jean-Baptiste Queru
60d1ee3e53 Better way to disable OTAs for crespo - DO NOT MERGE
OTAs need to be disabled for all products using crespo
hardware, not just a single one.

Change-Id: I961462e5e87bec8c59dafa13dbf0fdc96bab29ab
2010-08-20 19:19:55 -07:00
Ying Wang
13a019fe32 am 7daa9132: Disable OTA for crespo [DO NOT MERGE]
Merge commit '7daa91323139fa7c0435a07b0e3fad6056d0954b' into gingerbread-plus-aosp

* commit '7daa91323139fa7c0435a07b0e3fad6056d0954b':
  Disable OTA for crespo [DO NOT MERGE]
2010-08-20 17:13:56 -07:00