LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,267 Commits 2 Branches 0 Tags
7a734ced760c0a721b99f89f7bf4ff48d1f4415c
Commit Graph

16267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
754cfeb6f7 am 8641d4da: Move mulit-dex files around. 
* commit '8641d4dada2166c116c7663e33f47b297993038e':
  Move mulit-dex files around.
 2014-10-31 22:04:55 +00:00
Xavier Ducrohet
5b7f5d2bc4 Update build-tools revision. DO NOT MERGE. 
Change-Id: I2b59607e7cb24e3c09a2eb430380443d9c3e64d5
 2014-10-31 13:48:51 -07:00
Xavier Ducrohet
8641d4dada Move mulit-dex files around. 
This allows the mainDexClasses to work by
finding shrinkedAndroid.jar and proguard (from
the SDK Tools folder) correctly.

Change-Id: Ib3d85f775876b8a487af04bd072f6d8877f31d3b
 2014-10-31 13:47:47 -07:00
Christopher Ferris
5661570266 Do not call art-on macro by default. 
If you are debugging a native process, SIGSEGV gets ignored by default.
The gdbclient bash function has been modified to only call the art-on
macro when running gdbclient app_processXX.

Also, print a warning in case someone is trying to debug a native
process using app_process.

Bug: 17815162
Change-Id: I0666e6713b0a03ee713be7827c5b671938f2c263
(cherry picked from commit 436b740b70)
 2014-10-31 12:33:57 -07:00
Dave Allison
187be4adee Add support for debugging ART to the dalvik.gdb script. 
This adds two commands:

art-on
art-off

To the gdbclient script for debugging ART-based executables in gdb.
The default is 'art-on'

Bug: 17409881
Change-Id: I90a1aed603e50853a40d5f5ec1c9b168dc17ddc7
(cherry picked from commit 22382a4774)
 2014-10-31 12:33:52 -07:00
Baligh Uddin
40653ae9bb am f82c5022: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'f82c5022739c49b4990a280f5f9fc1a9f2c05fe6':
  Import translations. DO NOT MERGE
 2014-10-31 17:20:59 +00:00
Baligh Uddin
f82c502273 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:10:01 +00:00
Baligh Uddin
1dfe52103f am 1baffe78: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '1baffe78ce3d9c6cc153d5cdf8ad18be3db8abb5':
  Import translations. DO NOT MERGE
 2014-10-31 17:07:57 +00:00
Baligh Uddin
1baffe78ce Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:01:29 +00:00
Tim Kilbourn
bd76973c0c am b029e4d4: am 2f6ded27: Add secondary text to cards. 
* commit 'b029e4d451730720d1b3ee56f782f8cc1fb652d4':
  Add secondary text to cards.
 2014-10-31 00:14:52 +00:00
Dake Gu
57e93e8c1b am 82435b27: am f66eadb5: SupportLeanbackDemo: Add test case for updating overview row 
* commit '82435b27f7dd8d5297989bd4d49591cd26ade3cb':
  SupportLeanbackDemo: Add test case for updating overview row
 2014-10-31 00:12:56 +00:00
Xavier Ducrohet
bf541eb510 am f75191cb: am 0d574614: am 25907e2a: am 8361bb0d: Update build-tools and support for multidex. 
* commit 'f75191cb3e61886f6666ec238c983263b75be91e':
  Update build-tools and support for multidex.
 2014-10-31 00:12:52 +00:00
Xavier Ducrohet
a008a5698a am 2c799e08: am e67c313e: am 9ccbed21: am 86d28ad8: Add jack/jill/multidex lib to build-tools. 
* commit '2c799e0856e4bd9b7ec5071f08fdf074750d05cc':
  Add jack/jill/multidex lib to build-tools.
 2014-10-31 00:12:47 +00:00
bohu
7122b3e99f am 8a29ecdd: am 5bedd192: am ccaaeb5f: am c01f2d39: Merge "Update system images to revision 3" into lmp-dev 
* commit '8a29ecdd5e356722e123da3e5a61df05fe04b707':
  Update system images to revision 3
 2014-10-31 00:12:44 +00:00
Xavier Ducrohet
501c9ac4af am 94f4c803: am 1770d4bd: am 17d47a10: am 5193f245: Merge "Update build tools version to 21.1.0. DO NOT MERGE." into lmp-dev 
* commit '94f4c803949778a594c1bbe64bf64a31a5fd3a71':
  Update build tools version to 21.1.0. DO NOT MERGE.
 2014-10-31 00:12:37 +00:00
Takeshi Hagikura
90f430c952 am 0ebad463: am e38db4c5: am 5350100b: am f6855153: Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-dev 
* commit '0ebad4632dea62b8262f8cc807267c9159612438':
 2014-10-31 00:12:36 +00:00
Baligh Uddin
72d98225e5 Import translations. DO NOT MERGE 
Change-Id: I5874a7acf016c06931e064426cd73b83b79d9c26
Auto-generated-cl: translation import
 2014-10-30 15:45:57 -07:00
Andrew Hsieh
86437bbb65 am fbee7f97: am f8d4dfbf: Merge "Cherry-pick: Only use <atomic> for C++11 and newer" 
* commit 'fbee7f9704febbf81856e7d6d154f71381d95b06':
  Cherry-pick: Only use <atomic> for C++11 and newer
 2014-10-30 18:45:26 +00:00
Andrew Hsieh
fbee7f9704 am f8d4dfbf: Merge "Cherry-pick: Only use <atomic> for C++11 and newer" 
* commit 'f8d4dfbff6035e87e941cb75affac86c6d7e144e':
  Cherry-pick: Only use <atomic> for C++11 and newer
 2014-10-30 18:41:10 +00:00
Andrew Hsieh
f8d4dfbff6 Merge "Cherry-pick: Only use <atomic> for C++11 and newer" 2014-10-30 18:34:18 +00:00
Baligh Uddin
5fd0e38c0a Import translations. DO NOT MERGE 
Change-Id: Iefd0773327c4d0aa246381ea63b94b898cfcc75f
Auto-generated-cl: translation import
 2014-10-30 11:17:54 -07:00
Andrew Hsieh
add39dfea3 Cherry-pick: Only use <atomic> for C++11 and newer 
See bionic 3ce0769aa5f9a991af1d167f730d987dd002253c
BUG=17736764

Change-Id: If63b6c8394f8574fd198fd24dfc42a3aaba865d5
 2014-10-30 10:42:04 -07:00
Dake Gu
dc5cecd852 am 99cf1af3: am 455a4c3f: Merge "SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()" into lmp-mr1-dev 
* commit '99cf1af3c1589d9e36a07868dc1eb0fed25b4395':
  SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()
 2014-10-30 11:03:21 +00:00
Tim Kilbourn
b029e4d451 am 2f6ded27: Add secondary text to cards. 
* commit '2f6ded27f69c67b64b65e754beb56adc5ed651d0':
  Add secondary text to cards.
 2014-10-30 00:34:16 +00:00
Tim Kilbourn
2f6ded27f6 Add secondary text to cards. 
Add some content to PhotoItems so that the ImageCardViews use two lines
of text.

Bug: 18008019
Change-Id: I9bd72f585f76f84df70644b43539210664fbaa0e
 2014-10-29 17:19:04 -07:00
Dake Gu
82435b27f7 am f66eadb5: SupportLeanbackDemo: Add test case for updating overview row 
* commit 'f66eadb5d48ad0deeb373de9abf3ab053cdd9226':
  SupportLeanbackDemo: Add test case for updating overview row
 2014-10-29 22:55:31 +00:00
Xavier Ducrohet
f75191cb3e am 0d574614: am 25907e2a: am 8361bb0d: Update build-tools and support for multidex. 
* commit '0d574614cf568ec34e0804e6f7210a2d1a502d7f':
  Update build-tools and support for multidex.
 2014-10-29 22:53:19 +00:00
Xavier Ducrohet
2c799e0856 am e67c313e: am 9ccbed21: am 86d28ad8: Add jack/jill/multidex lib to build-tools. 
* commit 'e67c313ea0781650b7a31308dbe2cc5919425a3e':
  Add jack/jill/multidex lib to build-tools.
 2014-10-29 22:53:18 +00:00
bohu
8a29ecdd5e am 5bedd192: am ccaaeb5f: am c01f2d39: Merge "Update system images to revision 3" into lmp-dev 
* commit '5bedd1920b2af34b844f12bd4fa50047df57a22f':
  Update system images to revision 3
 2014-10-29 22:53:17 +00:00
Xavier Ducrohet
94f4c80394 am 1770d4bd: am 17d47a10: am 5193f245: Merge "Update build tools version to 21.1.0. DO NOT MERGE." into lmp-dev 
* commit '1770d4bdca62a1798aaa83618cc78450020162bf':
  Update build tools version to 21.1.0. DO NOT MERGE.
 2014-10-29 22:53:16 +00:00
Takeshi Hagikura
0ebad4632d am e38db4c5: am 5350100b: am f6855153: Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-dev 
* commit 'e38db4c528de2cd59370f6e6980ac4ba0d8221ab':
 2014-10-29 22:53:15 +00:00
Dake Gu
f66eadb5d4 SupportLeanbackDemo: Add test case for updating overview row 
fixes b/17918639: no back activity transition when overview row updated.
Also hook up the playback actvity.

Change-Id: I52fe3808a1dc614df7d1f33f36de47ce9144e974
 2014-10-29 14:44:50 -07:00
Xavier Ducrohet
0d574614cf am 25907e2a: am 8361bb0d: Update build-tools and support for multidex. 
* commit '25907e2a994aacf2d45743f23bb8adc54a3d2d44':
  Update build-tools and support for multidex.
 2014-10-29 18:52:23 +00:00
Xavier Ducrohet
e67c313ea0 am 9ccbed21: am 86d28ad8: Add jack/jill/multidex lib to build-tools. 
* commit '9ccbed2191c8b8dcca14e69e93b528c5f675f9c4':
  Add jack/jill/multidex lib to build-tools.
 2014-10-29 18:50:42 +00:00
bohu
5bedd1920b am ccaaeb5f: am c01f2d39: Merge "Update system images to revision 3" into lmp-dev 
* commit 'ccaaeb5f25aa9023404d4d8dd48f3bcd19291634':
  Update system images to revision 3
 2014-10-29 18:49:24 +00:00
Xavier Ducrohet
1770d4bdca am 17d47a10: am 5193f245: Merge "Update build tools version to 21.1.0. DO NOT MERGE." into lmp-dev 
* commit '17d47a107210b5e9566cdc2b0b9b177919a59560':
  Update build tools version to 21.1.0. DO NOT MERGE.
 2014-10-29 18:49:22 +00:00
Takeshi Hagikura
e38db4c528 am 5350100b: am f6855153: Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-dev 
* commit '5350100bbdfd1e4aa84c818f728f2d5193a7094f':
 2014-10-29 18:49:21 +00:00
Xavier Ducrohet
25907e2a99 am 8361bb0d: Update build-tools and support for multidex. 
* commit '8361bb0dfa16a3acc7752324e4690598ae0f2320':
  Update build-tools and support for multidex.
 2014-10-29 18:16:09 +00:00
Xavier Ducrohet
8361bb0dfa Update build-tools and support for multidex. 
Add the script to run multi-dex manually in build tools
Update non-maven support package to .0.1 to release a version
with the fixed multi-dex support lib.

Change-Id: I78c84e0d999855f9fc20fadfa21647e570a9f8c9
 2014-10-29 11:07:40 -07:00
Adam Lesinski
291e86fb92 am 23dfdd09: am 56fd4241: Merge "Enable building gtest for Windows" into lmp-mr1-dev 
* commit '23dfdd098448e193d63b0dcc4e5ba00b51ca2cff':
  Enable building gtest for Windows
 2014-10-29 00:17:32 +00:00
Dake Gu
99cf1af3c1 am 455a4c3f: Merge "SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()" into lmp-mr1-dev 
* commit '455a4c3f915bce079ca2aceb4fc30b2f6c44dd14':
  SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()
 2014-10-28 22:33:08 +00:00
Dake Gu
455a4c3f91 Merge "SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()" into lmp-mr1-dev 2014-10-28 22:27:57 +00:00
Dake Gu
b43b47c6d3 SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace() 
b/17893479

Change-Id: Iaf91ba1ebca1237fc0d2d5629e0c2e83e15d54a0
 2014-10-28 15:25:40 -07:00
Dake Gu
1554fa4339 am 1eaf20c6: am d18c4a82: Merge "SupportLeanbackDemo: show case of different image scale type" into lmp-mr1-dev 
* commit '1eaf20c653e3223be91774687f5249229693bffd':
  SupportLeanbackDemo: show case of different image scale type
 2014-10-28 20:29:43 +00:00
Xavier Ducrohet
9ccbed2191 am 86d28ad8: Add jack/jill/multidex lib to build-tools. 
* commit '86d28ad8c192084fea8926a56fec732d99cfcdbc':
  Add jack/jill/multidex lib to build-tools.
 2014-10-28 20:11:55 +00:00
Xavier Ducrohet
86d28ad8c1 Add jack/jill/multidex lib to build-tools. 
Change-Id: Id8aad3a7ea808c5b2d1dd5c008f6202aefb7ef3b
 2014-10-28 12:06:50 -07:00
Adam Lesinski
23dfdd0984 am 56fd4241: Merge "Enable building gtest for Windows" into lmp-mr1-dev 
* commit '56fd4241e6cdf9af750e18d36900b7b8552ff45f':
  Enable building gtest for Windows
 2014-10-28 17:45:08 +00:00
Adam Lesinski
56fd4241e6 Merge "Enable building gtest for Windows" into lmp-mr1-dev 2014-10-28 17:41:47 +00:00
Dake Gu
1eaf20c653 am d18c4a82: Merge "SupportLeanbackDemo: show case of different image scale type" into lmp-mr1-dev 
* commit 'd18c4a82e0a9837301436411867ca56bfed3a36f':
  SupportLeanbackDemo: show case of different image scale type
 2014-10-28 07:11:41 +00:00
bohu
ccaaeb5f25 am c01f2d39: Merge "Update system images to revision 3" into lmp-dev 
* commit 'c01f2d390fab6f51f1a9619daea6699521e3a679':
  Update system images to revision 3
 2014-10-28 06:31:57 +00:00