Commit graph

3196 commits

Author SHA1 Message Date
Ying Wang
570a0eeffb Dist userdataimg and tests-zip-package for tests builds
So that the build server can run the following command to build and dist only the two packages:
make -j16 tests-zip-package userdataimage-nodeps dist showcommands TARGET_BUILD_VARIANT=tests TARGET_PRODUCT=passion

Change-Id: I03d7049582ec8537a389e80b7ecdcae6625222ea
2010-09-10 14:39:33 -07:00
Gary King
1e80c294ff [build] move dumpvar.mk include after select.mk include
because the dumpvar target was included early in envsetup.mk, it was
not possible to use it to dump variables that were defined by makefiles
included later (like the toolchain variables in combo/select.mk).

move dumpvar.mk to after select.mk and javac.mk, so that shell functions
can be created using the toolchain build variables

Change-Id: I1c22025a8981fa91c183846fb28be26fb562adfb
Signed-off-by: Gary King <gking@nvidia.com>
2010-09-10 14:29:50 -07:00
Jean-Baptiste Queru
93847f5355 am cc84526b: Merge "Add atom optimization flags"
Merge commit 'cc84526bcef5ffd7ed9abf73dc3bfc9e29784b22' into gingerbread-plus-aosp

* commit 'cc84526bcef5ffd7ed9abf73dc3bfc9e29784b22':
  Add atom optimization flags
2010-09-10 13:03:13 -07:00
Jean-Baptiste Queru
cc84526bce Merge "Add atom optimization flags" 2010-09-09 14:07:21 -07:00
Jean-Baptiste Queru
7d6e54e49c am ccc10925: fix typo
Merge commit 'ccc10925b7da2200c6a5ddfa17bf31c517e9da7a' into gingerbread-plus-aosp

* commit 'ccc10925b7da2200c6a5ddfa17bf31c517e9da7a':
  fix typo
2010-09-08 15:31:52 -07:00
Jean-Baptiste Queru
ccc10925b7 fix typo
Change-Id: If4acf972380a94b160a656f849c4106025d3e6b2
2010-09-08 15:28:41 -07:00
Jean-Baptiste Queru
e0cb0fd3f5 resolved conflicts for merge of ba3ed0c7 to gingerbread-plus-aosp
Change-Id: I68ff2cd2350721b43b6620c763cfbac5f6805beb
2010-09-08 15:24:06 -07:00
Jean-Baptiste Queru
ba3ed0c7d0 a few more existing user modules to be grandfathered in - DO NOT MERGE
Change-Id: I6a2337bb557735276c93c306caac43a59abff47c
2010-09-08 15:15:15 -07:00
Jean-Baptiste Queru
0dda5a191d a few more existing user modules to be grandfathered in - DO NOT MERGE
Change-Id: Ie50faf26b5db9ac3c46f50da8c48c6132d4f2d1b
2010-09-08 15:12:07 -07:00
Jean-Baptiste Queru
b81c3989cb am 22e620c4: a few more existing user modules to be grandfathered in - DO NOT MERGE
Merge commit '22e620c4bed8c60361c02820cda4dfaafe83ebe5' into gingerbread-plus-aosp

* commit '22e620c4bed8c60361c02820cda4dfaafe83ebe5':
  a few more existing user modules to be grandfathered in - DO NOT MERGE
2010-09-08 14:34:47 -07:00
Dan Bornstein
3177afa817 am ca917dc2: Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread
Merge commit 'ca917dc2b2140b9fc4e331f94907cd27c8b6a91f' into gingerbread-plus-aosp

* commit 'ca917dc2b2140b9fc4e331f94907cd27c8b6a91f':
  Enable WITH_HOST_DALVIK for "user" builds on Linux.
2010-09-08 14:34:21 -07:00
Jean-Baptiste Queru
22e620c4be a few more existing user modules to be grandfathered in - DO NOT MERGE
Change-Id: I5f4c9f9ac948c2ba6865eae7dca2c0ed4d10702b
2010-09-08 14:19:06 -07:00
Dan Bornstein
ca917dc2b2 Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread 2010-09-08 12:37:11 -07:00
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
Dan Bornstein
f13bdd94dc Enable WITH_HOST_DALVIK for "user" builds on Linux.
Bug: 2497274
Change-Id: I636895b52c82f301f8c288ae670b34e1dbf32cc5
2010-09-08 11:19:27 -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
49da72c25a am dff3c597: cleanspec for corrupted build.prop
Merge commit 'dff3c59702392c2ed37b26b115c5cd0ed0498903' into gingerbread-plus-aosp

* commit 'dff3c59702392c2ed37b26b115c5cd0ed0498903':
  cleanspec for corrupted build.prop
2010-09-07 11:21:26 -07:00
Jean-Baptiste Queru
dff3c59702 cleanspec for corrupted build.prop
Change-Id: Ib8d6719af92759272ae25607862391647dfe408d
2010-09-07 11:18:09 -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
android-build SharedAccount
86558909e9 FRG58B
Change-Id: Id32bf5347ce2ea64d41e18602e1d0e6a9b1537ac
2010-09-03 15:16:26 -07:00
Doug Zongker
9314823c06 am 93d574f8: Merge "return to using subprocess for running commands" into gingerbread
Merge commit '93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9' into gingerbread-plus-aosp

* commit '93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9':
  return to using subprocess for running commands
2010-09-03 14:33:22 -07:00
Doug Zongker
93d574f8c5 Merge "return to using subprocess for running commands" into gingerbread 2010-09-03 14:31:03 -07:00
Doug Zongker
39a984550f return to using subprocess for running commands
Reverts Ic4f1c747 and fixes the problem by splitting the extra_flags
argument (it wasn't working before because it was getting one argument
"-c 4096 -s 128" instead of four arguments "-c", "4096", "-s", "128"
and mkyaffs2image apparently just ignores that bogus argument?)

Change-Id: Ib1e08d634aa68bfab0f7e09680d407f2cee0797d
2010-09-03 14:15:34 -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
dda34f535d am 42f40659: Merge "Disable new longjmp in glibc 2.11 and later."
Merge commit '42f406593e7fb1124e6aa00cc060e421d5a53554' into gingerbread-plus-aosp

* commit '42f406593e7fb1124e6aa00cc060e421d5a53554':
  Disable new longjmp in glibc 2.11 and later.
2010-09-02 09:58:58 -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
42f406593e Merge "Disable new longjmp in glibc 2.11 and later." 2010-09-02 09:44:39 -07:00
Ying Wang
163fa35fe3 Disable new longjmp in glibc 2.11 and later.
Bug: 2967937
Change-Id: I7a5ef082502192f41c26a48632edfe775dea7648
2010-09-01 16:56:25 -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
Jean-Baptiste Queru
eba22a05cb am 85fd5030: Revert "Fixed problem with keymap files copied to target"
Merge commit '85fd5030b11d412f345b0ed039aa9912c7973aea' into gingerbread-plus-aosp

* commit '85fd5030b11d412f345b0ed039aa9912c7973aea':
  Revert "Fixed problem with keymap files copied to target"
2010-09-01 06:23:50 -07:00
Jean-Baptiste Queru
85fd5030b1 Revert "Fixed problem with keymap files copied to target"
This reverts commit c90449f2a8.
2010-09-01 06:10:40 -07:00
Jean-Baptiste Queru
8abb5cc10f am a160e316: Merge "Fixed problem with keymap files copied to target"
Merge commit 'a160e3169e6624610fd05b2edd14b674ffb54e44' into gingerbread-plus-aosp

* commit 'a160e3169e6624610fd05b2edd14b674ffb54e44':
  Fixed problem with keymap files copied to target
2010-08-31 15:04:01 -07:00
Jean-Baptiste Queru
a160e3169e Merge "Fixed problem with keymap files copied to target" 2010-08-31 14:52:54 -07:00
Joe Onorato
42ee0a2a48 am cd7c775e: fix the build still
Merge commit 'cd7c775ece6854765ae3208818e76d9d11724713' into gingerbread-plus-aosp

* commit 'cd7c775ece6854765ae3208818e76d9d11724713':
  fix the build still
2010-08-31 13:00:56 -07:00
Joe Onorato
cd7c775ece fix the build still
Change-Id: I2bfbcdd4b463549f3f331ac7a1c7fa89aadef1a8
2010-08-31 12:56:49 -07:00