Commit graph

3223 commits

Author SHA1 Message Date
Jean-Baptiste Queru
1c436bfef3 am 130b539b: (-s ours) am 890ef4b0: a few more existing user modules to be grandfathered in - DO NOT MERGE
Merge commit '130b539bfdda612dd3858b407c503c3e80d9aa72'

* commit '130b539bfdda612dd3858b407c503c3e80d9aa72':
  a few more existing user modules to be grandfathered in - DO NOT MERGE
2010-09-08 13:14:04 -07:00
Jean-Baptiste Queru
2d85efaa91 am 78a59022: (-s ours) a few more grandfathered user tags - DO NOT MERGE
Merge commit '78a59022f89a65f5e7107d57f4995c1eb70e1fb2'

* commit '78a59022f89a65f5e7107d57f4995c1eb70e1fb2':
  a few more grandfathered user tags - DO NOT MERGE
2010-09-08 13:13:58 -07:00
Jeff Hamilton
724fdabcfc Merge "Add more cleanspecs for the property files, fixing ro.secure." 2010-09-08 12:31:10 -07:00
Jeff Hamilton
f5d730d5aa Add more cleanspecs for the property files, fixing ro.secure.
Change-Id: Iae47959c25ca9779df7679528d1d61ebd3c48b50
2010-09-08 14:26:13 -05: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
Jean-Baptiste Queru
9b0c8839bf am 6b747cfb: (-s ours) am a90f9d2c: Merge "Warn when new modules are found that use user tags - DO NOT MERGE" into gingerbread
Merge commit '6b747cfb21e270598c0d1bf1923c4da768a676a8'

* commit '6b747cfb21e270598c0d1bf1923c4da768a676a8':
  Warn when new modules are found that use user tags - DO NOT MERGE
2010-09-08 10:38:19 -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
e7c0ad103c am 49da72c2: am dff3c597: cleanspec for corrupted build.prop
Merge commit '49da72c25abeb36fc5d9a1c786ee3f232cfc7682'

* commit '49da72c25abeb36fc5d9a1c786ee3f232cfc7682':
  cleanspec for corrupted build.prop
2010-09-07 11:56:45 -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
fff865f06f am 8f731bb2: am 0545c916: Revert "Allow properties with spaces in their values"
Merge commit '8f731bb2720475f652cc8c5849d564246b234bef'

* commit '8f731bb2720475f652cc8c5849d564246b234bef':
  Revert "Allow properties with spaces in their values"
2010-09-07 10:56:53 -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
dea79b5c19 am 30d68a3b: (-s ours) am 817f07ae: Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
Merge commit '30d68a3b9df5657ca0eefb063551202490a836fb'

* commit '30d68a3b9df5657ca0eefb063551202490a836fb':
  Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
2010-09-07 10:32:32 -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
Ying Wang
8a08e8d1ab Merge "Fix the unstripped path if LOCAL_MODULE_PATH is set." 2010-09-07 10:20:19 -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
Ying Wang
90ca11a2d3 Fix the unstripped path if LOCAL_MODULE_PATH is set.
Bug: 2953067

Change-Id: I12a0bdb1f3df4fa98bea70f60e0ce26bf863c924
2010-09-03 16:24:01 -07:00
Doug Zongker
5c3dc2ad44 am 9314823c: am 93d574f8: Merge "return to using subprocess for running commands" into gingerbread
Merge commit '9314823c06d4434bf18d589c2fdea490428becf8'

* commit '9314823c06d4434bf18d589c2fdea490428becf8':
  return to using subprocess for running commands
2010-09-03 14:35:49 -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
c60c1bafa0 resolved conflicts for merge of a4a50996 to master
Change-Id: I52c617ff43aaf9e86b8fb7a2e9c305127566971a
2010-09-03 13:22:38 -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
f06675e2a4 am 4b1e2245: am c5b8d4ce: Merge "The old clean target had bit rotted." into gingerbread
Merge commit '4b1e2245857d696aa0dfcd7a163c6d04025c74f6'

* commit '4b1e2245857d696aa0dfcd7a163c6d04025c74f6':
  The old clean target had bit rotted.
2010-09-03 10:36:46 -07:00
Ying Wang
54b634dce8 am a79db6e4: am 3dae0ee4: Fix inherited dependency when instrmentation.
Merge commit 'a79db6e47a378cb089021a56637a9c6925f14261'

* commit 'a79db6e47a378cb089021a56637a9c6925f14261':
  Fix inherited dependency when instrmentation.
2010-09-03 10:36:41 -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
e0b19f60c0 am 54b8b436: am de3bfade: Allow properties with spaces in their values
Merge commit '54b8b436a380b053772110796642c7e5e6ba8e64'

* commit '54b8b436a380b053772110796642c7e5e6ba8e64':
  Allow properties with spaces in their values
2010-09-02 17:15:29 -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
e9010e18cb am dda34f53: am 42f40659: Merge "Disable new longjmp in glibc 2.11 and later."
Merge commit 'dda34f535d01518e44564a9cde525b768042cf90'

* commit 'dda34f535d01518e44564a9cde525b768042cf90':
  Disable new longjmp in glibc 2.11 and later.
2010-09-02 10:52:32 -07:00
Ying Wang
ac628ed792 am 2e1347c6: am fb644881: Disable new longjmp in glibc 2.11 and later.
Merge commit '2e1347c6a010c51c9ec80fd312465c1c23666ab2'

* commit '2e1347c6a010c51c9ec80fd312465c1c23666ab2':
  Disable new longjmp in glibc 2.11 and later.
2010-09-02 10:52:29 -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
Ying Wang
7c15ef0eae Merge "Now slang supports "-I" options." 2010-09-01 14:47:54 -07:00
Ying Wang
512802772a Now slang supports "-I" options.
Change-Id: I32aef6c913d9d30f9982a593397145f1562aecf9
2010-09-01 13:28:52 -07:00
Joe Onorato
aaa5d11cb3 Make it so if you say LOCAL_UNINSTALLABLE_MODULE := true for a docs build, it won't try to dist it.
Change-Id: Iff8a7b6438d392c5b4c425337b84cfa9bc90f282
2010-09-01 10:39:50 -07:00
Jean-Baptiste Queru
fe648a9f58 manual merge
Change-Id: Iafb6e494f28050c960185656d4d630a6c27b6efe
2010-09-01 06:33:19 -07:00