bohu
50dc27b2ca
Revert "Emulator: update development to 2362bfb6"
...
It breaks build of docs because SdkSetup has dependency
on gsf-client
This reverts commit 5c26bfa4bc
2017-06-23 14:19:05 -07:00
Huan Ren
5ea5b8eb3e
Merge "Emulator: update development to 2362bfb6" into oc-dev am: 3a14fee0ac
...
am: 0fc588fb5f
2017-06-23 19:52:33 +00:00
Huan Ren
0fc588fb5f
Merge "Emulator: update development to 2362bfb6" into oc-dev
...
am: 3a14fee0ac
2017-06-23 19:47:35 +00:00
Huan Ren
3a14fee0ac
Merge "Emulator: update development to 2362bfb6" into oc-dev
2017-06-23 18:33:16 +00:00
Alex Klyubin
667251b58f
Merge "Add apksigner tool to Android O SDK build-tools" into oc-dev am: 9e87e29dc8
...
am: 6b3b57e18d
2017-06-23 03:08:20 +00:00
Alex Klyubin
6b3b57e18d
Merge "Add apksigner tool to Android O SDK build-tools" into oc-dev
...
am: 9e87e29dc8
2017-06-23 03:03:50 +00:00
TreeHugger Robot
9e87e29dc8
Merge "Add apksigner tool to Android O SDK build-tools" into oc-dev
2017-06-23 02:55:41 +00:00
Sergey Prigogin
fc2e8eaf31
New version of api-generator tool
...
The new version produces api-versions.xml file with API removal
information. The format of the file is backward compatible.
Test: api-generator was tested as part of ag/2298689
Bug: 37127307
Change-Id: I0db84363b973a2c6076dcb42033a09a5566ff9f1
(cherry picked from commit 1c6c892938
2017-06-22 17:59:39 +00:00
Alex Klyubin
9022cd4718
Add apksigner tool to Android O SDK build-tools
...
This places apksigner command-line tool in Android SDK's build-tools
directory. The tool is intended as an Android-specific replacement for jarsigner.
Bug: 62696222
Change-Id: I099ea6840d0e7e0b00f438357543cb656990442a
(cherry picked from commit a825e5d309629b2f9cb3b52ba6d9895562729001)
2017-06-19 16:20:56 +00:00
bohu
5c26bfa4bc
Emulator: update development to 2362bfb6
...
Bug: 37302997
oc-emu-dev
commit 2362bfb6d6c4ee4540af5e69130951849c7e109e
Author: bohu <bohu@google.com >
Date: Thu Apr 6 16:37:48 2017 -0700
Emulator: copy encryptionkey.img to SDK img zip
Change-Id: I057d58733bb39e0777d2f5c9494d5969ac46953a
(cherry picked from commit 6620016eb673ac885e5892604f04d3123a8ee0b9)
2017-06-15 18:13:02 +00:00
Nicolas Geoffray
6e29efea37
Merge "Track move of tzdata: bionic to system/timezone" am: 867ff783d3 am: eaff783dd7
...
am: 88de1bce27
2017-06-15 09:16:51 +00:00
Nicolas Geoffray
88de1bce27
Merge "Track move of tzdata: bionic to system/timezone" am: 867ff783d3
...
am: eaff783dd7
2017-06-15 09:13:47 +00:00
Neil Fuller
784c54378f
Track move of tzdata: bionic to system/timezone
...
Track the movement of the tzdata file from bionic to
system/timezone.
Bug: 31008728
Bug: 36882778
Test: make sdk
Merged-In: I6cff023cb8b6eb7fec81a5ea61f3c06343f462f3
Change-Id: I6cff023cb8b6eb7fec81a5ea61f3c06343f462f3
2017-06-14 16:35:01 +01:00
Sergey Prigogin
1c6c892938
New version of api-generator tool
...
The new version produces api-versions.xml file with API removal
information. The format of the file is backward compatible.
Test: api-generator was tested as part of ag/2298689
Bug: 37127307
Change-Id: I0db84363b973a2c6076dcb42033a09a5566ff9f1
2017-05-30 11:31:45 -07:00
Dan Willemsen
b401d6b43c
Dist the windows 64-bit libaapt2_jni
...
Bug: 36697262
Test: m -j dist win_sdk
Change-Id: Ie1a0f7fc0eeb3f32b20c3bc9a988c9bd7b385fdd
2017-04-04 17:19:13 -07:00
Adam Lesinski
e2a83797da
Package libwinpthread-1.dll in build-tools
...
Bug: 36474054
Test: make PRODUCT-sdk-win_sdk
Change-Id: I39b182aa56b2dba48e752c91760f3ebe0b085d7a
2017-03-29 19:46:18 -07:00
Alan Viverette
af9c8f24f7
Restore "Remove Support Library from SDK build"
...
This reverts commit 5e690a21eb
2017-03-18 06:00:56 -04:00
Alan Viverette
5e690a21eb
Revert "Remove Support Library from SDK build" to fix build
...
This reverts commit 0ff1cf9d4d
2017-03-18 01:49:38 +00:00
Alan Viverette
0ff1cf9d4d
Remove Support Library from SDK build
...
The Support Library ships separately via SDK Manager. It should not be
included in the base SDK build. Also, the version was wrong and it was
missing several modules.
Bug: 36171385
Test: make sdk
Change-Id: I827429b13adc2bfebf1620413f879227513a294a
2017-03-17 12:40:05 -04:00
Alan Viverette
91eed12fb0
Update SDK build for recently-added support library modules
...
Bug: 35707648
Test: make sdk
Change-Id: I6b5991b0544492ec2db8b66ab7eb7c17af8ba882
2017-03-16 15:17:11 -04:00
Alan Viverette
1289f9b041
Clean up multidex build for SDK
...
These files are unnecessary.
Bug: 36122649
Test: make sdk
Change-Id: I504dae76af9e7339e01d6307e5c8d42aa00e740a
2017-03-13 12:39:29 -04:00
Josh Gao
4bf932d860
Merge "Package libwinpthread-1.dll in platform-tools." am: 52c291d53c am: 0b8f64ced5
...
am: ebb9ac748b
2017-03-10 02:18:14 +00:00
Josh Gao
0b8f64ced5
Merge "Package libwinpthread-1.dll in platform-tools."
...
am: 52c291d53c
2017-03-10 02:12:14 +00:00
Josh Gao
a920f75082
Package libwinpthread-1.dll in platform-tools.
...
Test: make PRODUCT-sdk-win_sdk
Change-Id: Ie21402331ca73a5c6e7cb5108a2fde386f357def
2017-03-09 16:00:52 -08:00
Doris Liu
d69f0a2fd8
Add dynamic-animation to sdk build
...
Change-Id: I6ab7c6b110b98c60f550b331ed7525849e394c36
2017-03-06 11:23:22 -08:00
Siva Velusamy
7f3417f336
Include pre-generated copy of api-versions DO NOT MERGE
...
This CL changes the api-versions.xml file released in platform tools
to correspond to what was checked into prebuilts rather than what
is being generated by the build. The version generated by the AOSP
build is incorrect for release, but we are now moving to releasing
platform tools from AOSP. In addition, this file will be removed
from platform tools after a few releases (it will be available from
the platform component instead).
Test: make win_sdk sdk_repo and check the included api-versions.xml
Change-Id: I0c3dd3c99ec0c852e7cf8d86b83e298e157044d2
2017-02-14 13:09:59 -08:00
Tor Norbye
c9b0afb05a
Leave API database in platform-tools a little longer
...
Test: N/A
Change-Id: I60957290f3333e9beaf140bdc9e55a469a20246c
2017-02-06 13:58:44 -08:00
Tor Norbye
c3043030b4
Merge "Package the API and annotation data with the SDK"
2017-02-03 09:36:44 +00:00
Tor Norbye
bfbf659a1e
Package the API and annotation data with the SDK
...
Until now they've been packaged in the platform-tools
component but we'd like this data to vary by SDK
platform.
Test: Just a build packaging change. Built and
manually verified the files are in the new place.
Change-Id: Ied554f20c6aefd02e8a12989986ce5828e5eed40
2017-02-02 03:30:39 -08:00
Jerome Gaillard
1ce8478af3
Merge "Fix sdk build following Change I4c9763ab"
2017-02-01 16:35:27 +00:00
Gustav Sennton
069b646cc5
Merge "Use utf-8 instead of default encoding in build_android_stubs.mk" am: 656f329a74 am: 62d1c8df8e am: 999955239c
...
am: 996da23960
2017-01-26 08:39:37 +00:00
Gustav Sennton
999955239c
Merge "Use utf-8 instead of default encoding in build_android_stubs.mk" am: 656f329a74
...
am: 62d1c8df8e
2017-01-26 08:35:04 +00:00
Gustav Sennton
750ec6e7e1
Use utf-8 instead of default encoding in build_android_stubs.mk
...
When not explicitly setting the encoding to use for 'javac' it uses some
default encoding - this will fail when using ascii as default encoding
and compiling files containing utf-8 characters.
Bug: 34098662
Test: ran 'make' locally (internal master) for an Angler build.
Change-Id: I9dbdabbfa69f04c52e09285d85494e0f0d188518
2017-01-25 16:30:24 +00:00
Jerome Gaillard
aa96e55333
Fix sdk build following Change I4c9763ab
...
Test: Build sdk from clean build
Change-Id: I93e7300dac22a32b4b550a3834778195f7eec583
2017-01-23 18:26:44 +00:00
Diego Perez
b8c1dc203a
Replace layoutlib with the legacy version
...
Test: Build SDK manually
Change-Id: I4c9763ab8460ccecb0ca35715d7169a255fab590
2017-01-17 15:30:29 +00:00
Trevor Johns
5aecb03666
samples: Update sdk.atree for nyc-mr1-dev am: f22b170c9c am: 7ac700738e am: e273543f62
...
am: a2096ad5b3
2017-01-13 00:32:52 +00:00
Trevor Johns
e273543f62
samples: Update sdk.atree for nyc-mr1-dev am: f22b170c9c
...
am: 7ac700738e
2017-01-13 00:27:50 +00:00
Trevor Johns
f22b170c9c
samples: Update sdk.atree for nyc-mr1-dev
...
Syncing with latest sample prebuilts. Renamed
ActionBarCompat-ShareActionProvider to ShareActionProvider.
Change-Id: I50e566e35a01ad82c5faa5ab112b999c8407021a
2017-01-12 12:29:30 -08:00
Jean-Luc Brouillet
99a10fe3dc
Merge "Move rs/scriptc to rs/script_api/include." am: 06003a47cb am: 2c57112a6f am: a2d8c18be5
...
am: 497709169f
2017-01-11 02:27:37 +00:00
Jean-Luc Brouillet
a2d8c18be5
Merge "Move rs/scriptc to rs/script_api/include." am: 06003a47cb
...
am: 2c57112a6f
2017-01-11 02:18:05 +00:00
Jean-Luc Brouillet
44d885f3aa
Move rs/scriptc to rs/script_api/include.
...
Test: make sdk -j 20
Change-Id: If51700c17b0e5d572b24aeed0851b02ceddb7732
2017-01-09 19:10:59 +00:00
Aurimas Liutikas
ba1490277f
Update reference to support library palette manifest file.
...
Fixes broken sdk builder after ag/1753735
Bug: None
Test: None
Change-Id: Ia5d2d16851ddd9d5f855be39947e6d340d1483be
2017-01-03 14:39:28 -08:00
Dan Willemsen
5949aac5b9
Merge "Remove undefined PRIVATE_* variable" am: 06eb77a682 am: fd643dcacf am: 51d5ec21ec
...
am: 8a4d4e03b0
2016-12-21 22:38:20 +00:00
Dan Willemsen
51d5ec21ec
Merge "Remove undefined PRIVATE_* variable" am: 06eb77a682
...
am: fd643dcacf
2016-12-21 22:23:49 +00:00
Dan Willemsen
899bafdc02
Remove undefined PRIVATE_* variable
...
This variable isn't defined for $(jack_lib), and isn't needed, since we
haven't created our intermediate directory at this point.
Test: Run in different configurations (no options, dist tests), make
sure this command line doesn't change.
Change-Id: Ie863e1e632a9b6eb343b3f411f6c6cc548fa2a2c
2016-12-20 14:58:24 -08:00
Yohann Roussel
9bcc30a78a
Merge "Deliver android-support-multidex.jack in SDK" am: da07dcd7f9 am: d29421db99 am: 32e1696537
...
am: 4fe4e0dafe
2016-12-05 15:50:22 +00:00
Yohann Roussel
32e1696537
Merge "Deliver android-support-multidex.jack in SDK" am: da07dcd7f9
...
am: d29421db99
2016-12-05 15:43:21 +00:00
Yohann Roussel
d29421db99
Merge "Deliver android-support-multidex.jack in SDK"
...
am: da07dcd7f9
2016-12-05 15:36:50 +00:00
Yohann Roussel
19b848f707
Deliver android-support-multidex.jack in SDK
...
Bug: https://code.google.com/p/android/issues/detail?id=224026
Test: make PRODUCT-sdk-win_sdk sdk_repo
Change-Id: Iecc0f7bc5c3518d9ac81111a52f8a7b3ecbcc717
2016-11-30 20:07:04 +01:00
Andreas Gampe
c314a2fca5
Merge "SDK: Add missing tool dependencies" am: d405a14f22 am: 4e84f39c1d am: c68e6f0997
...
am: 7ad7f11c67
2016-11-28 20:07:52 +00:00
