LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,253 Commits 2 Branches 0 Tags
55dc8e65c24e3b0dd99049d9552b6f5c96ba5eea
Commit Graph

13253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
55dc8e65c2 am 91e2c5dc: Merge "Fix libportable build breakage." 
* commit '91e2c5dcde466a1f147220b3c753862b77a5da9e':
  Fix libportable build breakage.
 2014-06-08 05:33:30 +00:00
Elliott Hughes
91e2c5dcde Merge "Fix libportable build breakage." 2014-06-08 05:30:16 +00:00
Elliott Hughes
fc9ac9f173 Fix libportable build breakage. 
Change-Id: Ic85e36cf55b7486b50fc9f1513f10a8ade5e86e9
 2014-06-07 22:24:44 -07:00
Raphael Moll
95671f78a5 am 03afa4d6: Merge "Android USB driver: support 4EE7 (Nexus adb only)." 
* commit '03afa4d6719a52180f1d553590a4f33d5dd08377':
  Android USB driver: support 4EE7 (Nexus adb only).
 2014-06-06 22:07:30 +00:00
Raphael Moll
03afa4d671 Merge "Android USB driver: support 4EE7 (Nexus adb only)." 2014-06-06 22:03:05 +00:00
Raphael Moll
700c6fd81d Android USB driver: support 4EE7 (Nexus adb only). 
Bug: b/14988808
Change-Id: Ib855f063c949649c059da09483f782d09fbf3d2c
 2014-06-06 12:50:21 -07:00
Jesse Hall
ea3858285b am 3d1f0837: Merge "ndk: Remove extra GLES symbols on 64-bit platforms" 
* commit '3d1f08375865a75ab6f67a45967cf9ad0c19ef72':
  ndk: Remove extra GLES symbols on 64-bit platforms
 2014-06-06 16:16:57 +00:00
Jesse Hall
3d1f083758 Merge "ndk: Remove extra GLES symbols on 64-bit platforms" 2014-06-06 16:13:37 +00:00
Jesse Hall
2433ffdef5 ndk: Remove extra GLES symbols on 64-bit platforms 
The original arch-arm libGLESv1_CM.so and libGLESv2.so symbols in
android-4 and android-5 were correct. They didn't include some vendor
extension symbols that are in the platform library but that apps
should query at runtime rather than link against.

When arch-x86 and arch-mips were added in android-9, they mistakenly
included these extension symbols. Oh well, for compatibility we can't
fix that now.

The android-20 symbols for all architectures were copied from x86 or
mips, and include the extension symbols. To avoid spreading the
mistake, this change:

(a) Removes the symbol files for architectures that existed in earlier
versions of the platform, since they shouldn't change in android-20.

(b) Removes the extension symbols on 64-bit platforms, so they match
the symbols in arch-arm.

Change-Id: Ib227d9d163bfe2859b13eb57dc19518d3a3f90d0
 2014-06-05 18:36:32 -07:00
Raphael Moll
4000df931b am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder." 
* commit '6ab8ef21b8826b19e92a47f70d3ba30e04ba66cc':
  Move SDK system-image source.prop_templates in their own folder.
 2014-06-04 21:46:13 +00:00
Raphael Moll
6ab8ef21b8 Merge "Move SDK system-image source.prop_templates in their own folder." 2014-06-04 21:30:14 +00:00
Steve Moyer
d87e9d3534 am e561dd48: (-s ours) DO NOT MERGE: fix package for AndroidJUnitRunner 
* commit 'e561dd484613737f0ee9289bab4be4361b3fab31':
  DO NOT MERGE: fix package for AndroidJUnitRunner
 2014-06-04 17:12:13 +00:00
Steve Moyer
bbf180719d am 23a8adf2: (-s ours) DO NOT MERGE: Add SmsTest and mege emulator smoke tests 
* commit '23a8adf276448f68efb049a2f2ef3409af59dd1c':
  DO NOT MERGE: Add SmsTest and mege emulator smoke tests
 2014-06-04 17:01:46 +00:00
Steve Moyer
e561dd4846 DO NOT MERGE: fix package for AndroidJUnitRunner 
Change-Id: I6b3fb006212f273d018121800d1d94e8a8d7404d
 2014-06-04 09:59:22 -07:00
Steve Moyer
23a8adf276 DO NOT MERGE: Add SmsTest and mege emulator smoke tests 
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Conflicts:
	build/sdk.atree

Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
 2014-06-04 09:55:31 -07:00
Raphael Moll
728f321cb9 Merge "Add Build-Tools runtime.properties file." 2014-06-04 04:05:07 +00:00
Raphael Moll
26bcf6a511 Move SDK system-image source.prop_templates in their own folder. 
This allows to have a different rule to generate the source.properties
based on the templates and place them in a directory that depends on
the current target CPU ABI. In turn this prevents the build from
mixing different source.props when building different targets.

Change-Id: I4a1d9f47426c94f376947ddae8be9f5549331616
 2014-06-03 17:30:16 -07:00
Raphael Moll
37433ac223 Add Build-Tools runtime.properties file. 
Change-Id: I5addf44a2ea3dbb91df5a49f6fcb10e75047fa82
 2014-06-03 13:46:51 -07:00
Andrew Hsieh
80bc93153d Merge "Fix warning about undefined __LP64__" 2014-06-03 07:33:17 +00:00
Andrew Hsieh
7f4142f25e Merge "Refresh 64-bit headers/libs (WW22)" 2014-06-03 07:25:05 +00:00
Raphael Moll
087ccb0152 Merge "Fix SDK repo to prevent mixing different targets." 2014-06-03 01:27:03 +00:00
Raphael Moll
4df9f469f7 Fix SDK repo to prevent mixing different targets. 
This makes sure that sdk-repo-*.zip doesn't exist to
avoid merging into an existing one.

Also fix a warning when generating the repo.xml files.

Change-Id: I645ad13936b83c5c33bd84c046b60b77488b9113
 2014-06-02 17:11:45 -07:00
Andrew Hsieh
37f7e7421f am e7a46c48: Merge "Add lib symlink to x86_64 so that 32-bit static libs are available" 
* commit 'e7a46c48417ff67390d80d6df457742b30430857':
  Add lib symlink to x86_64 so that 32-bit static libs are available
 2014-06-02 07:09:38 +00:00
Andrew Hsieh
e7a46c4841 Merge "Add lib symlink to x86_64 so that 32-bit static libs are available" 2014-06-02 07:06:48 +00:00
Andrew Hsieh
e85f942ec6 Fix warning about undefined __LP64__ 
See b.android.com/69975

Change-Id: If7f2b6fa29c36221b1a0d31a334cb34cecb4e8bc
 2014-06-02 14:44:19 +08:00
Pavel Chupin
2e807e16dc Add lib symlink to x86_64 so that 32-bit static libs are available 
When multilib toolchain in NDK is used in -m32 mode we need 32-bit static libs
available for static compilation.

Change-Id: Ie7b5659f05338565fd19550ae4368934422e8b86
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
 2014-06-01 18:52:16 +04:00
Ben Cheng
dc898c7838 am 550e4425: Merge "Build both 64- and 32-bit versions." 
* commit '550e44253f2eb23b909c80c9a9717c2cc36b4b8b':
  Build both 64- and 32-bit versions.
 2014-05-30 17:04:47 +00:00
Ben Cheng
550e44253f Merge "Build both 64- and 32-bit versions." 2014-05-30 17:00:01 +00:00
Ben Cheng
c54a9369f0 Build both 64- and 32-bit versions. 
Change-Id: I9e641cebcd71cb680ecb326e8c75e68e7d016ea4
 2014-05-30 09:58:47 -07:00
Andrew Hsieh
727ac63f0a Refresh 64-bit headers/libs (WW22) 
Change-Id: Ic49750508a4c825e6ac222d8cd417e71dae53cbd
 2014-05-30 23:21:02 +08:00
Narayan Kamath
d9fb901dc6 am 479cf9ff: Merge "Track changes to IActivityManager.startInstrumentation." 
* commit '479cf9ff668f04fcc4deb24b115ef766f5115373':
  Track changes to IActivityManager.startInstrumentation.
 2014-05-30 10:37:50 +00:00
Narayan Kamath
479cf9ff66 Merge "Track changes to IActivityManager.startInstrumentation." 2014-05-30 10:35:30 +00:00
Narayan Kamath
fc9e3f6878 Track changes to IActivityManager.startInstrumentation. 
Change-Id: Iceaecb720c2824134a1d6d13b1f3e0a16d41d76d
 2014-05-30 11:33:02 +01:00
Andrew Hsieh
ad3e847512 am 844bc1d3: Merge "Refresh 64-bit headers/libs (WW21)" 
* commit '844bc1d331a8714fbc54492ed119e0db86555d36':
  Refresh 64-bit headers/libs (WW21)
 2014-05-29 19:12:25 +00:00
Andrew Hsieh
844bc1d331 Merge "Refresh 64-bit headers/libs (WW21)" 2014-05-29 19:09:37 +00:00
Andrew Hsieh
19f647e8a7 Refresh 64-bit headers/libs (WW21) 
Change-Id: I013af3ae4adac17d7b2ef5680d41d75dc9799d19
 2014-05-28 21:07:45 +08:00
Raphael Moll
937cfb4260 am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64" 
* commit '6e56697cb229cd8c163583a03259a6787f60a84a':
  Ability to generate SDK system-images for arm64 and x86_64
 2014-05-28 01:57:55 +00:00
Raphael Moll
6e56697cb2 Merge "Ability to generate SDK system-images for arm64 and x86_64" 2014-05-28 01:56:17 +00:00
Ben Cheng
5f7d9640ae am 960a770d: Merge "Move the panorama benchmark from packages/apps/Camera to here." 
* commit '960a770d6c27bd986b15e8cf7579d10d5ccb2b1d':
  Move the panorama benchmark from packages/apps/Camera to here.
 2014-05-28 00:18:20 +00:00
Ben Cheng
960a770d6c Merge "Move the panorama benchmark from packages/apps/Camera to here." 2014-05-28 00:15:35 +00:00
Ben Cheng
4b5b3887b9 Move the panorama benchmark from packages/apps/Camera to here. 
Also cut unnecessary dependencies on other parts of Android and build
staticly linked binaries so that the benchmark can be run on barebone
systems.

Change-Id: I69ea59c677c750d1982389dd62a6a74e4719d547
 2014-05-27 16:12:56 -07:00
Raphael Moll
4986fd4fdd Ability to generate SDK system-images for arm64 and x86_64 
(Cherry-picked from 40c7126e7c)

Change-Id: I2715a668271ed88fcd0c8c97ac35d05fcdd34a06
 2014-05-27 16:10:14 -07:00
Elliott Hughes
95387dd162 am f570883a: Merge "Fix MIPS build." 
* commit 'f570883afaad1887da8c30fbfa51e70ffa6f268e':
  Fix MIPS build.
 2014-05-23 21:34:25 +00:00
Ying Wang
df3def7094 am 8eaca3a3: Merge "Host multilib build." 
* commit '8eaca3a30e184e235c0dcd0acabb9268a7bf25bf':
  Host multilib build.
 2014-05-23 21:34:23 +00:00
Elliott Hughes
f570883afa Merge "Fix MIPS build." 2014-05-23 21:31:18 +00:00
Ying Wang
8eaca3a30e Merge "Host multilib build." 2014-05-23 21:28:26 +00:00
Elliott Hughes
caebfa9b50 Fix MIPS build. 
We really ought to remove libportable.

Bug: 14903517
Change-Id: Id96b24bfe329096adffd94d452f440295d8aa83a
 2014-05-23 14:24:15 -07:00
Ying Wang
3bc8fd9e50 Host multilib build. 
Bug: 13751317
Change-Id: I05ad98c1f3f55e3288fbcc169311a7685b872fd9
 2014-05-20 17:59:48 -07:00
Raphael Moll
261307bebe resolved conflicts for merge of bf164835 to stage-aosp-master 
Change-Id: I3c380b1ddae5e088985513398d7eb6274d8426eb
 2014-05-20 16:29:29 -07:00
Raphael Moll
bf164835e6 Merge "Fix SDK build." 2014-05-20 21:12:26 +00:00