openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
12,841 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

12841 Commits

Author SHA1 Message Date
Dianne Hackborn 870d5f16a5 Merge "Add LOCAL_APK_LIBRARIES argument." into jb-mr2-dev 2013-03-12 19:31:11 +00:00
The Android Automerger 25fd33abe4 JDQ39C 2013-03-12 11:24:51 -07:00
Dianne Hackborn a1fece009f Add LOCAL_APK_LIBRARIES argument. 
This allows you to build apks that link against other
apks using the framework's new shared library apk feature.

Also if you are using LOCAL_APK_LIBRARIES, then LOCAL_DEX_PREOPT
will not be allowed.  This is because using preopt means the
apk is stripped of its dex file, so the pre-installed apk can't
be redexed if its associated library changes.  (Even if the build
system didn't strip the dex, Dalvik still has issues because it
assumes a pre-odex file is always valid.)

Change-Id: I952c0d24f8975f75aff67f78b5faeec91144c3e7
 2013-03-12 10:50:28 -07:00
The Android Open Source Project 954f2d4ed2 am 753fd854: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '753fd85443a93a179a494f3359e40eb38baf102e':
  JWQ71
  JWQ70C
  JWQ70B
  JWQ70
  JWQ66E
  JWQ66D
  JWQ66C
  Add fr_CA to l10n builds Bug: 7579865
  JWQ66B
  JWQ66
  JWQ65B
  JWQ65
  JWQ64B
 2013-03-12 14:16:37 +00:00
The Android Open Source Project 753fd85443 Reconcile with jb-mr2-release - do not merge 
Change-Id: I69ef6ac591047be719e1dc4a1330a0c9573b90bb
 2013-03-12 07:14:15 -07:00
The Android Automerger 5018ef2f1d JWQ71 2013-03-12 05:58:43 -07:00
The Android Automerger 19531aa710 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-12 05:55:16 -07:00
The Android Automerger 6a27f43166 JWQ70C 2013-03-11 15:50:48 -07:00
keunyoung 5fc6da8a97 am a9dafdb8: am 51e11eea: Merge "reflect the migration of emulator hal to device/generic/goldfish" into jb-mr2-dev 
* commit 'a9dafdb8ae1730e63928e98974d3bbb3fa3a02f5':
  reflect the migration of emulator hal to device/generic/goldfish
 2013-03-11 21:52:43 +00:00
keunyoung a9dafdb8ae am 51e11eea: Merge "reflect the migration of emulator hal to device/generic/goldfish" into jb-mr2-dev 
* commit '51e11eea6d64dd156ce22ff3103ddf5676ef2d73':
  reflect the migration of emulator hal to device/generic/goldfish
 2013-03-11 21:50:51 +00:00
keunyoung 51e11eea6d Merge "reflect the migration of emulator hal to device/generic/goldfish" into jb-mr2-dev 2013-03-11 21:48:55 +00:00
Scott Main 008b830c31 am b2395f96: am 6959bce3: am e9d67dcc: am 56662610: am 5fef291f: am 3aca7544: am 2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width 
* commit 'b2395f96cf362e0309de285c17b1220af29ef880':
  tweak jspane width property to ensure bg color for highlighted item is full width
 2013-03-11 21:01:09 +00:00
Scott Main b2395f96cf am 6959bce3: am e9d67dcc: am 56662610: am 5fef291f: am 3aca7544: am 2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width 
* commit '6959bce3dee76146d7bd6cc92780ffdb29fcf457':
  tweak jspane width property to ensure bg color for highlighted item is full width
 2013-03-11 20:58:29 +00:00
Scott Main 6959bce3de am e9d67dcc: am 56662610: am 5fef291f: am 3aca7544: am 2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width 
* commit 'e9d67dccb01cf91d04b71f590b8e91737be70e64':
  tweak jspane width property to ensure bg color for highlighted item is full width
 2013-03-11 13:55:05 -07:00
Scott Main e9d67dccb0 am 56662610: am 5fef291f: am 3aca7544: am 2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width 
* commit '5666261023e8b5362f848ccfd307d52c6b1f2150':
  tweak jspane width property to ensure bg color for highlighted item is full width
 2013-03-11 13:51:18 -07:00
Scott Main 5666261023 am 5fef291f: am 3aca7544: am 2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width 
* commit '5fef291f3e9fa5139d0876a960e0173ef77842da':
  tweak jspane width property to ensure bg color for highlighted item is full width
 2013-03-11 13:49:53 -07:00
Scott Main 5fef291f3e am 3aca7544: am 2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width 
* commit '3aca7544a51296777a91fa6e3ef203cebf14d04c':
  tweak jspane width property to ensure bg color for highlighted item is full width
 2013-03-11 13:48:34 -07:00
Scott Main 3aca7544a5 am 2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width 
* commit '2d967c6df63c625659dbca486a4ba0a20c1f3561':
  tweak jspane width property to ensure bg color for highlighted item is full width
 2013-03-11 13:47:13 -07:00
The Android Automerger 13cde96a71 JWQ70B 2013-03-11 12:05:10 -07:00
keunyoung fe30957867 reflect the migration of emulator hal to device/generic/goldfish 
- no longer need to check the presence as device/generic/goldfish is in PDK

Change-Id: I551dd283fb6511d8ebd45a8519f797f8ba2f1a05
 2013-03-11 09:41:17 -07:00
Torne (Richard Coles) 5a8721bb03 am 7a3231b5: am a8d89e15: Merge "Don\'t try to group static libraries on mac." into jb-mr2-dev 
* commit '7a3231b5fcdeababe20f883044480b257d305282':
  Don't try to group static libraries on mac.
 2013-03-11 16:36:56 +00:00
Torne (Richard Coles) 7a3231b5fc am a8d89e15: Merge "Don\'t try to group static libraries on mac." into jb-mr2-dev 
* commit 'a8d89e15f0fe4e3e5156526e25e51a7901b57b68':
  Don't try to group static libraries on mac.
 2013-03-11 16:35:06 +00:00
Torne (Richard Coles) a8d89e15f0 Merge "Don't try to group static libraries on mac." into jb-mr2-dev 2013-03-11 16:31:09 +00:00
Ying Wang 07dd97aac1 am 08951a06: am bacedf66: am 4f499fba: am c36f41fd: Merge "Support gdb wrappers" 
* commit '08951a0631fa84d321357aa8fbe379c48782fc39':
  Support gdb wrappers
 2013-03-11 16:29:58 +00:00
Ying Wang 08951a0631 am bacedf66: am 4f499fba: am c36f41fd: Merge "Support gdb wrappers" 
* commit 'bacedf66d2ecf05d100cf830d6dc4bd22f8562e7':
  Support gdb wrappers
 2013-03-11 16:28:12 +00:00
Ying Wang bacedf66d2 am 4f499fba: am c36f41fd: Merge "Support gdb wrappers" 
* commit '4f499fba73dd7bc04248f310df9b8b90f93d5de8':
  Support gdb wrappers
 2013-03-11 09:26:06 -07:00
Ying Wang 4f499fba73 am c36f41fd: Merge "Support gdb wrappers" 
* commit 'c36f41fd38c0dfc09ef486e6c3b2eda26c3a5b24':
  Support gdb wrappers
 2013-03-11 09:24:06 -07:00
Scott Main 2d967c6df6 tweak jspane width property to ensure bg color for highlighted item is full width 
Change-Id: I92e66493229476c29cf71c74091f36063638def4
 2013-03-11 09:21:07 -07:00
Ying Wang c36f41fd38 Merge "Support gdb wrappers" 2013-03-11 16:08:23 +00:00
Torne (Richard Coles) 71f8b245ce Don't try to group static libraries on mac. 
Mac's linker doesn't support --start-group and --end-group; it scans
libraries repeatedly even without these options, so it's not necessary.

Change-Id: If22527e75470f7fa9452dc33efe4d40a60d0919a
 2013-03-11 14:59:42 +00:00
The Android Automerger 800750ec6d JWQ70 2013-03-11 05:58:51 -07:00
The Android Automerger 8d38807fe0 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-11 05:55:27 -07:00
Michael Wright a2c0ba7067 am 8b803e22: am eb73384e: Fixed whitespace and env pollution issues in pez 
* commit '8b803e223bbb5e343be1230ad502fc1a9a928012':
  Fixed whitespace and env pollution issues in pez
 2013-03-09 02:18:01 +00:00
Michael Wright 8b803e223b am eb73384e: Fixed whitespace and env pollution issues in pez 
* commit 'eb73384e02639259b3ef04bb1856607d4dcf265c':
  Fixed whitespace and env pollution issues in pez
 2013-03-09 02:13:27 +00:00
Michael Wright eb73384e02 Fixed whitespace and env pollution issues in pez 
Change-Id: I40574d6cdab31e920535c09d24fe8463aee57586
 2013-03-08 17:34:02 -08:00
Alex Ray e9c08e6e15 am 72ff914e: am f0d08ebd: pez: colored SUCCESS/FAILURE indicator 
* commit '72ff914e954fa3ed7f0cf89e6f33ac438e1766c2':
  pez: colored SUCCESS/FAILURE indicator
 2013-03-08 23:41:35 +00:00
Alex Ray 72ff914e95 am f0d08ebd: pez: colored SUCCESS/FAILURE indicator 
* commit 'f0d08ebd2f6b32e879efda3c496d24503919e0e9':
  pez: colored SUCCESS/FAILURE indicator
 2013-03-08 23:38:10 +00:00
Alex Ray f0d08ebd2f pez: colored SUCCESS/FAILURE indicator 
pez is a new bash function that can be prepended to existing functions
or commands to clearly show a colored exit status.

Example:
$ pez mmm frameworks/base/etc

will print all the usual output, and at the end either a green "SUCCESS"
line or a red "FAILURE" line.

Change-Id: I7e369b0280d6ece16fb0be1895278c26922491fe
 2013-03-08 15:23:15 -08:00
John Michelau 502002526f Support gdb wrappers 
Use gdbwrapper() for launching gdb.  This can be redefined to launch
one of the many gdb wrappers instead.

Example:
function gdbwrapper()
{
    ddd --debugger $ANDROID_TOOLCHAIN/$GDB -x "$@"
}

Change-Id: I3cce8a2ca1bae6d531e2388a93cb52075b21a42c
 2013-03-08 14:12:32 -06:00
Kenny Root e41f22590a am 73cb9ffe: am 24753394: am ae9dc40d: am eda13282: Merge changes I1998a9d6,I2513f0de 
* commit '73cb9ffeef0fa60effbb82d7235d61a731b18041':
  Function to grep AndroidManifest.xml files.
  Utility to dump stacks from arbitrary processes.
 2013-03-08 19:50:18 +00:00
Kenny Root 73cb9ffeef am 24753394: am ae9dc40d: am eda13282: Merge changes I1998a9d6,I2513f0de 
* commit '24753394b9d848c610d3251752988f65fd54a0cb':
  Function to grep AndroidManifest.xml files.
  Utility to dump stacks from arbitrary processes.
 2013-03-08 19:47:45 +00:00
Kenny Root 24753394b9 am ae9dc40d: am eda13282: Merge changes I1998a9d6,I2513f0de 
* commit 'ae9dc40d9e3a4dfe949b82b95d0e92012c4308e6':
  Function to grep AndroidManifest.xml files.
  Utility to dump stacks from arbitrary processes.
 2013-03-08 11:45:55 -08:00
Kenny Root ae9dc40d9e am eda13282: Merge changes I1998a9d6,I2513f0de 
* commit 'eda132820bede79a109c16aa0c91bd6cb15380d8':
  Function to grep AndroidManifest.xml files.
  Utility to dump stacks from arbitrary processes.
 2013-03-08 11:44:03 -08:00
The Android Automerger 9597f7440c JWQ66E 2013-03-08 11:28:21 -08:00
Kenny Root eda132820b Merge changes I1998a9d6,I2513f0de 
* changes:
  Function to grep AndroidManifest.xml files.
  Utility to dump stacks from arbitrary processes.
 2013-03-08 19:23:00 +00:00
Stephen Hines ab58a79f8a am d80152f6: am 6b151013: Merge "Mips needs to be marked little-endian explicitly." into jb-mr2-dev 
* commit 'd80152f6f9663ac94e4f010b61690bfde1cbd6ce':
  Mips needs to be marked little-endian explicitly.
 2013-03-08 19:06:00 +00:00
Stephen Hines d80152f6f9 am 6b151013: Merge "Mips needs to be marked little-endian explicitly." into jb-mr2-dev 
* commit '6b151013442ea2806a85b2c802f18ab7f0b27b61':
  Mips needs to be marked little-endian explicitly.
 2013-03-08 19:02:10 +00:00
Stephen Hines 6b15101344 Merge "Mips needs to be marked little-endian explicitly." into jb-mr2-dev 2013-03-08 18:59:53 +00:00
Jeff Sharkey 9bf2bf3527 am fa6969b7: am d4da19d7: Merge "Function to grep AndroidManifest.xml files." into jb-mr2-dev 
* commit 'fa6969b790569a2b21328f1b166863ee3c73f646':
  Function to grep AndroidManifest.xml files.
 2013-03-08 18:57:52 +00:00
Jeff Sharkey 301bbadb12 Function to grep AndroidManifest.xml files. 
(cherry picked from commit 50b61e9e66)

Change-Id: I1998a9d6a05176fc7fc8643c5d1c40e2dd699d4e
 2013-03-08 10:56:45 -08:00