summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* gdbclient: fix adb output teststable/cm-13.0-ZNH0EScott Mertz2016-01-021-1/+1
| | | | | | | M adb produces an error message when no devices are connected. The test for length needs to be quoted. Change-Id: I39566d3bf7b65dbdcb49942afb3076b77e206e48
* gdbclient: fallback to $OUT if availableScott Mertz2015-12-281-0/+4
| | | | | | | | When the OUT environment variable is set, use it for the path to the symbols. This fixes the case where OUT_DIR_COMMON_BASE is used in a full environment to specify a custom output directory. Change-Id: I4b918fbadb29031f0459995613aac4762f3e009a
* idegen: don't use hardcoded out directoryKhalid Zubair2015-12-081-1/+1
| | | | | | Use the host bin dir defined by the build env. Change-Id: Icee817d647d44e77a29688dc2238c6490cc6f807
* Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-0812-46/+96
|\ | | | | | | | | | | https://android.googlesource.com/platform/development into HEAD Android 6.0.1 release 3
| * Update the Connectivity debug app to the multinetwork API.Lorenzo Colitti2015-10-223-34/+81
| | | | | | | | | | | | | | | | | | 1. Stop using the deprecated startUsingNetworkFeature and use requestNetwork instead. 2. Make use of clearCapabilities(). Bug: 23597341 Change-Id: I65cb813111947d159d2bb18f0d8a93fb726912e5
| * am 19923db3: Update build tools rev to <API>.0.2. DO NOT MERGE.Xavier Ducrohet2015-10-141-1/+1
| |\ | | | | | | | | | | | | * commit '19923db346370643f55b2ef43116ea64b6da5b8c': Update build tools rev to <API>.0.2. DO NOT MERGE.
| | * Update build tools rev to <API>.0.2. DO NOT MERGE.Xavier Ducrohet2015-10-141-1/+1
| | | | | | | | | | | | Change-Id: If727cdef7982419b676e56a910e0bdf56df5488a
| * | am afe2d242: Fix llvm-rs-cc.exe crash for windowsMiao Wang2015-10-131-4/+7
| |\| | | | | | | | | | | | | * commit 'afe2d2420480e93f3364e0deac3082c11cceb689': Fix llvm-rs-cc.exe crash for windows
| | * Fix llvm-rs-cc.exe crash for windowsMiao Wang2015-10-131-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | - Move the dlls needed by llvm-rs-cc to the same folder as the executable. Bug: 23315748 Change-Id: I2d306684fcfd1c600c1bdb6f7050d671601c6b17
| * | am 419fb50c: Merge "Update system images to revision 4" into mnc-devBo Hu2015-10-097-7/+7
| |\| | | | | | | | | | | | | * commit '419fb50cad5ca8cadb45c26552fd767109474315': Update system images to revision 4
| | * Merge "Update system images to revision 4" into mnc-devBo Hu2015-10-097-7/+7
| | |\
| | | * Update system images to revision 4bohu2015-09-117-7/+7
| | | | | | | | | | | | | | | | Change-Id: Ibdbc001c84f9a9c159ae76f657944e05941136f8
* | | | gdbclient: Properly locate outdir on CMSteve Kondik2015-12-031-9/+13
| | | | | | | | | | | | | | | | Change-Id: I3b549ce7159af4169e61e42d738e9f86c18f8708
* | | | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-054-4/+18
|\ \ \ \ | | | | | | | | | | | | | | | Android 6.0.0 release 26
| * \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-10-020-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-200-0/+0
| | |\ \ \
| | | * \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-310-0/+0
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-290-0/+0
| | | | |\ \
| | | | | * | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-290-0/+0
| | | | |/| | | | | |/|/ /
| | | | * | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-220-0/+0
| | | | |\ \
| | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-130-0/+0
| | | | | |\ \
| | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-080-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-010-0/+0
| | | | | | | |\ \
| | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-290-0/+0
| | | | | | | | |\ \
| | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-280-0/+0
| | | | | | | | | |\ \
| | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-250-0/+0
| | | | | | | | | | |\ \
| | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-230-0/+0
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-160-0/+0
| | | | | | | | | | | | |\ \
| | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-140-0/+0
| | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-110-0/+0
| | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-080-0/+0
| | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-060-0/+0
| | | | | | | | | | | | | | | | |\ \
| * | | | | | | | | | | | | | | | \ \ am 82336df0: Pass in current android.jar to api-generatorTor Norbye2015-09-271-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | * commit '82336df0c11445ba7ce6228bb4983a914328c710': Pass in current android.jar to api-generator
| | * | | | | | | | | | | | | | | | Pass in current android.jar to api-generatorTor Norbye2015-09-261-2/+5
| | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the api-versions.xml shipped with the SDK always includes the correct latest API data (see http://b.android.com/183500) Change-Id: I96a6b0218abeaf3865a49de0fdd2be933f88c469 (cherry picked from commit fbe6c8105a6cbd880ff50d9799e23cf1790f1301)
| * / / / / / / / / / / / / / / / Import translations. DO NOT MERGEBaligh Uddin2015-09-181-0/+8
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I52f9e0ca4704f52015b44af909c18b966f03ff05 Auto-generated-cl: translation import
| * | | | | | | | | | | | | | | Merge "Bump support library version to 23.0.1 DO NOT MERGE" into mnc-devChris Flatt2015-08-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Bump support library version to 23.0.1 DO NOT MERGEChris Flatt2015-08-271-1/+1
| | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I268eea0b49a9bf611e36bb9cc5d91adf2a2ff01e
| * | | | | | | | | | | | | | | Add customtabs support lib to extras/android/support/Yusuf Ozuysal2015-08-272-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the only way to get access to customtabs library through download m2repository and using the aar file whereas all other support libs are also present in extras/android/support/ with the corresponding resources and jar file. This adds the jar and manifest to the corresponding folder to avoid the confusion to developers. This is relanding https://googleplex-android-review.git.corp.google.com/#/c/756492/ after it was reverted due to not having the corresponding Android.mk change. Change-Id: I21969994e1dd0bb4f9abbfa395cf284e3cfc396d
| * | | | | | | | | | | | | | | am 5163378d: (-s ours) am f3ddcb27: am 844574cb: Update LayoutLib revision ↵Deepanshu Gupta2015-08-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | number. [DO NOT MERGE] * commit '5163378d218cdd9e5e7b5db9de7ed37dd8887dd8': Update LayoutLib revision number. [DO NOT MERGE]
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f3ddcb27: am 844574cb: Update LayoutLib revision number. [DO NOT MERGE]Deepanshu Gupta2015-08-261-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f3ddcb279bfdc9618bf0b29a33d6ad188bcd8aff': Update LayoutLib revision number. [DO NOT MERGE]
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 844574cb: Update LayoutLib revision number. [DO NOT MERGE]Deepanshu Gupta2015-08-261-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '844574cb2c69dcd57be9523f0c2c0c3dcc4da867': Update LayoutLib revision number. [DO NOT MERGE]
| | | | * | | | | | | | | | | | | | | Update LayoutLib revision number. [DO NOT MERGE]Deepanshu Gupta2015-08-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a32442861809dfa8e4b39a232777388f8c082b5
| * | | | | | | | | | | | | | | | | | Revert "Add customtabs support lib to extras/android/support/"Yusuf Ozuysal2015-08-261-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 53ad2de7f6677c31eb42dbd117b4857f38fc36f4. Change-Id: Ia9831d344e6e0b12c55544b02254daae109f09c5
| * | | | | | | | | | | | | | | | | | Add customtabs support lib to extras/android/support/Yusuf Ozuysal2015-08-251-0/+2
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the only way to get access to customtabs library through download m2repository and using the aar file whereas all other support libs are also present in extras/android/support/ with the corresponding resources and jar file. This adds the jar and manifest to the corresponding folder to avoid the confusion to developers. Change-Id: Id6d71e4071c0725257cadb539cd47230d6727914
* | | | | | | | | | | | | | | | | | Grant dev tools system permission to trigger media-scan serviceAllen Shen2015-10-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Google add the action ACTION_MEDIA_MOUNT into the list of protected boradcast, so that ordinary apps cannot trigger media scanning by directly sending the action out. The system built-in dev tool is granted system permission so that it will not crash when executing media scaning tools. Change-Id: I19797e61ba829df39d2b66f209cf41bf6565170f
* | | | | | | | | | | | | | | | | | Dev Tools: hide the icon!Chirayu Desai2015-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change default catergory of the main activity to DEFAULT instead of LAUNCHER Change-Id: I25ed302ea3eedb93b5119a83f08b6d50aaecce08
* | | | | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-220-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-010-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | |