LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,153 Commits 2 Branches 0 Tags
d45cc6b4e9b882b593f46af6cbb7bcd8b64af4a4
Commit Graph

14153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chet Haase
6f8533c207 am 37c4ea46: am a1a8337f: am f02d4487: am 9262e703: Merge "Fix ApiDemo for transitions" into klp-dev 
* commit '37c4ea4637cd62f7bc27efb16526a4fa457084fe':
 2014-05-13 15:15:44 +00:00
Adam Koch
4a296a447a am 94ebdc8f: am b184cdd9: am fb159c79: am 7165109e: Bitmapfun Sample: Cleanup gradle files to import into Studio properly. 
* commit '94ebdc8fafcef323870f03f5a63c83f5743bf6ab':
 2014-05-13 15:15:40 +00:00
Chong Zhang
3584f2b768 am 03beab7e: am 9d0982d5: am 2e2085f4: am 2ec448a2: am 58ef2c38: am fd6d06a1: mrp sample: refactor and use helper class 
* commit '03beab7e9508de617cf7c35c4f32047cf779fc44':
 2014-05-13 15:15:38 +00:00
Jeff Brown
ba9ddd7f4a am b133e0e6: am 65f5b5bb: am c683fb4c: am bb1f4a73: am 10f22587: am 6a81c4be: Fix NPE in sample code. 
* commit 'b133e0e6321fcfc10c26573b2ed07d225e79db58':
 2014-05-13 15:15:37 +00:00
Adam Koch
93643bc6e5 am 0ec39f3d: am c352e57b: am 0d873095: am 933dd8a3: Merge "Bitmapfun Sample: Update for KitKat and clean up some minor bugs." into klp-dev 
* commit '0ec39f3d8027b4acac6405a0d1683510b1fd98c6':
 2014-05-13 15:15:35 +00:00
Adam Koch
f732e842db am f224cd4c: am ad76f956: am 107a3b94: am c246e4a8: Merge "Bitmapfun Sample: Migrate to Android Studio/gradle project." into klp-dev 
* commit 'f224cd4cc7198a3924fff71c4d2ad07e6d0fd3ff':
 2014-05-13 15:15:34 +00:00
Ben Cheng
a82f844560 am b1d6d2e4: am f85cfcfe: am c888278c: am d4b49c6c: am 8edf8ef6: Merge "Refresh sysroot headers for aarch64." 
* commit 'b1d6d2e4801fe468b45f9b081cb908ac62a63365':
 2014-05-13 15:15:32 +00:00
Tor Norbye
af0c4e80a2 am 1163d57b: am 68370aef: am 03a66dd8: am 30278c6f: Merge "Update the api-version.xml file to reflect KitKat recent changes" into klp-dev 
* commit '1163d57b5de1b7807d02c0e1227b11e51c6c6b1b':
 2014-05-13 15:15:31 +00:00
Evan Charlton
a69f916a8b resolved conflicts for merge of a706c744 to master-nova 
Change-Id: I18498f7319dbe7ce8a52bb87106339c4046ac2c9
 2014-05-12 17:19:20 -07:00
David 'Digit' Turner
72a0c45934 am a9206776: am 3907ebb7: am 94ebf1e6: Merge "libportable: Add dependency on libdl." 
* commit 'a9206776feed51f027ad9e6dac31b7dc2e5f86cf':
  libportable: Add dependency on libdl.
 2014-05-12 13:38:41 +00:00
David 'Digit' Turner
a9206776fe am 3907ebb7: am 94ebf1e6: Merge "libportable: Add dependency on libdl." 
* commit '3907ebb75e450b02f6996f6fa368ca0d2bacfb4a':
  libportable: Add dependency on libdl.
 2014-05-12 13:36:05 +00:00
David 'Digit' Turner
3907ebb75e am 94ebf1e6: Merge "libportable: Add dependency on libdl." 
* commit '94ebf1e6a993391f8139e4ee4702c02bdda560a9':
  libportable: Add dependency on libdl.
 2014-05-12 13:31:55 +00:00
David 'Digit' Turner
94ebf1e6a9 Merge "libportable: Add dependency on libdl." 2014-05-12 13:28:34 +00:00
David 'Digit' Turner
e398009921 libportable: Add dependency on libdl. 
The patch at [1] was reverted because ndk/sources/android/cpu-features
is now part of the platform build (as a dependency of libportable), and
now requires dlopen()/dlsym()/dlclose().

Because the platform build system doesn't support LOCAL_EXPORT_LDLIBS,
add the dependency to libportable's own module definition instead.
After this patch is submitted, it's possible to re-apply the original
patch and get a working build.

[1] https://android-review.googlesource.com/#/c/91380/

BUG=13679666

Change-Id: I54b4376a562242d21631eaf13090650decfe791d
 2014-05-12 15:10:01 +02:00
Andrew Hsieh
be9d36572c am 106c0c69: am 3d34e652: am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist." 
* commit '106c0c694c9818fd45fee7afa0af33b25407fb25':
  Add libcxx projects and compiler-rt to windows whitelist.
 2014-05-12 10:34:52 +00:00
Andrew Hsieh
106c0c694c am 3d34e652: am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist." 
* commit '3d34e6524e035c6f55cac6553c73c7b18f9910c3':
  Add libcxx projects and compiler-rt to windows whitelist.
 2014-05-12 10:30:32 +00:00
Andrew Hsieh
3d34e6524e am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist." 
* commit '7b004d960657c15145ce1272f7a61c8ca4272cd1':
  Add libcxx projects and compiler-rt to windows whitelist.
 2014-05-12 10:27:46 +00:00
Andrew Hsieh
7b004d9606 Merge "Add libcxx projects and compiler-rt to windows whitelist." 2014-05-12 10:23:36 +00:00
Andrew Hsieh
8433215b56 am c78fab9f: am 829367fd: am 46452519: Merge "Refresh android-20 headers/libs" 
* commit 'c78fab9f39dd7ac8c0649de6fb5b7f251a4c34f2':
  Refresh android-20 headers/libs
 2014-05-12 04:01:48 +00:00
Andrew Hsieh
c78fab9f39 am 829367fd: am 46452519: Merge "Refresh android-20 headers/libs" 
* commit '829367fdb42839e1c1e7bd8ce25206048d8e0a2f':
  Refresh android-20 headers/libs
 2014-05-12 03:58:05 +00:00
Andrew Hsieh
829367fdb4 am 46452519: Merge "Refresh android-20 headers/libs" 
* commit '4645251978aaa9e9db0501efb03f56432a1b9b85':
  Refresh android-20 headers/libs
 2014-05-12 03:53:30 +00:00
Andrew Hsieh
4645251978 Merge "Refresh android-20 headers/libs" 2014-05-12 03:47:32 +00:00
Stephen Hines
d7d603fbbb Add libcxx projects and compiler-rt to windows whitelist. 
Change-Id: I2d6189b4e9a0440330d1212dae9396b88b66ea3f
 2014-05-09 14:45:58 -07:00
Andrew Hsieh
f81cdeba6a Refresh android-20 headers/libs 
bionic: adfc007dbf936bd021d79ba2d2c360a3cfc77be9  5/19 2014

Change-Id: I4836f04d9b5b68abe7896e246c9dffa2e175e4ca
 2014-05-09 20:08:02 +08:00
Andrew Hsieh
116bf16d1f am 870c6634: am 557c79bf: am b769dcb8: Merge "Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN" 
* commit '870c6634cce1ec436b541d3023c318d5a9fd5013':
  Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN
 2014-05-09 02:52:48 +00:00
Andrew Hsieh
870c6634cc am 557c79bf: am b769dcb8: Merge "Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN" 
* commit '557c79bf9fc30d9978af67db04604fd035d90f97':
  Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN
 2014-05-09 02:48:27 +00:00
Andrew Hsieh
557c79bf9f am b769dcb8: Merge "Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN" 
* commit 'b769dcb815594fc1407d58c7d1e10f72a48aa196':
  Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN
 2014-05-09 02:43:24 +00:00
Andrew Hsieh
b769dcb815 Merge "Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN" 2014-05-09 02:38:01 +00:00
Xavier Ducrohet
580b170364 am 6ee534bf: am 557639cf: am 2567045c: Merge "Remove SDK tools from build." 
* commit '6ee534bf5d492e61e03fa863ddfb2142131cad9f':
  Remove SDK tools from build.
 2014-05-09 00:59:58 +00:00
Xavier Ducrohet
6ee534bf5d am 557639cf: am 2567045c: Merge "Remove SDK tools from build." 
* commit '557639cf1167a32c9601a53fd70af7eb81413556':
  Remove SDK tools from build.
 2014-05-09 00:56:45 +00:00
Xavier Ducrohet
557639cf11 am 2567045c: Merge "Remove SDK tools from build." 
* commit '2567045c07dfae87fa53dfdc349681b5311d3522':
  Remove SDK tools from build.
 2014-05-09 00:52:33 +00:00
Xavier Ducrohet
2567045c07 Merge "Remove SDK tools from build." 2014-05-09 00:46:53 +00:00
Xavier Ducrohet
ce00253c5b Remove SDK tools from build. 
(cherry picked from commit 1678734ef064893f28390fac16f4633d0fb7361a)

Change-Id: Ia689f66868de18341b863e19f2958434eb45ca59
 2014-05-08 14:49:09 -07:00
Xavier Ducrohet
f4554e79e0 am 40ad715f: am 7fc13d7a: am 1cad9512: Merge "Fix repo script to ignore tools" 
* commit '40ad715f74740451e888b336b302f9e8628f3964':
  Fix repo script to ignore tools
 2014-05-08 21:42:58 +00:00
Xavier Ducrohet
40ad715f74 am 7fc13d7a: am 1cad9512: Merge "Fix repo script to ignore tools" 
* commit '7fc13d7ad63eb0fad3d30b4b909baca6651ee303':
  Fix repo script to ignore tools
 2014-05-08 19:36:30 +00:00
Xavier Ducrohet
7fc13d7ad6 am 1cad9512: Merge "Fix repo script to ignore tools" 
* commit '1cad951295f4b7bbd6edd8c1c5c7a791f7078033':
  Fix repo script to ignore tools
 2014-05-08 19:32:31 +00:00
Xavier Ducrohet
1cad951295 Merge "Fix repo script to ignore tools" 2014-05-08 19:28:09 +00:00
Xavier Ducrohet
d81eb5d833 Fix repo script to ignore tools 
Change-Id: I80e6d5802f9a4633378d432eff3e91c2fcf83eeb
 2014-05-08 12:26:20 -07:00
Andrew Hsieh
08f9413ce2 am 96dc8d39: am b05c061e: am 4bc52758: Merge "Update epoll.h from bionic" 
* commit '96dc8d3956ada4cef55797049e8c91dc5eb42c0d':
  Update epoll.h from bionic
 2014-05-08 18:31:23 +00:00
Pavel Chupin
4120ceca07 Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN 
Update signal.c for build with old platforms

Change-Id: Ica87465a73004c0885d51e384acd4f42947cc19b
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
 2014-05-08 15:34:45 +04:00
Andrew Hsieh
96dc8d3956 am b05c061e: am 4bc52758: Merge "Update epoll.h from bionic" 
* commit 'b05c061e501ef35b6b988e5f1f99ecb670d01bbe':
  Update epoll.h from bionic
 2014-05-08 00:45:00 +00:00
Andrew Hsieh
b05c061e50 am 4bc52758: Merge "Update epoll.h from bionic" 
* commit '4bc5275825af47e11479b2cbff01193e90ca2ff4':
  Update epoll.h from bionic
 2014-05-08 00:42:39 +00:00
Andrew Hsieh
4bc5275825 Merge "Update epoll.h from bionic" 2014-05-08 00:40:20 +00:00
Pavel Chupin
9973b9197f Update epoll.h from bionic 
Change-Id: I0c1c8180bcfab5022d5dcdcb5c768a17b9d77f16
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
 2014-05-07 19:06:03 +04:00
Jaekyun Seok
e4e9dc65f1 Return result code properly 
Bug: 13444380
Change-Id: Ica2231115032e88cd967316768e0e9c71a359336
 2014-05-07 16:05:37 +09:00
Tim Kilbourn
85283c70fa am 62843523: (-s ours) am d91fd1cb: DO NOT MERGE Remove banner from manifest. 
* commit '62843523e650d83e17d6bac7a62d229888568ad8':
  DO NOT MERGE Remove banner from manifest.
 2014-05-06 21:30:47 +00:00
Tim Kilbourn
62843523e6 am d91fd1cb: DO NOT MERGE Remove banner from manifest. 
* commit 'd91fd1cb4be7f2c0672ffd9dbd38b304e44c0cc0':
  DO NOT MERGE Remove banner from manifest.
 2014-05-06 21:24:03 +00:00
Tim Kilbourn
d91fd1cb4b DO NOT MERGE Remove banner from manifest. 
The api is hidden in klp-modular-dev.

Change-Id: I78a569c7d876e0716eba9163490331dc5d81f87e
 2014-05-06 14:16:35 -07:00
Raphael Moll
e9001a4d53 am 891910a3: (-s ours) am bde50dcb: (-s ours) am 21980124: (-s ours) Merge "Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."" 
* commit '891910a34c4eeac866715c78cf0e9b8f9b89767f':
  Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."
 2014-05-05 22:58:55 +00:00
Raphael Moll
891910a34c am bde50dcb: (-s ours) am 21980124: (-s ours) Merge "Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."" 
* commit 'bde50dcb0c7cd8a7a88be95ed2c5612872099f1e':
  Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."
 2014-05-05 22:54:58 +00:00