Commit Graph

643 Commits

Author SHA1 Message Date
Nan Zhang
e5f330b940 Copy files related to sdk dev tool(activity_actions.txt, and etc.) from
offline-sdk

Originally these files were dumped to out/target/common/docs. However,
three modules(offline-sdk, offline-sdk-referenceonly, and
offline-system-sdk-referenceonly) generate these files with the same
name which might cause the problem that these files got overwritten back
and forth.

Test: m -j out/target/common/docs/offline-sdk-timestamp
Bug: b/70351683
Change-Id: Ia433796a0152bc9efacf656d06efc2a328a756a1
Merged-In: Ia433796a0152bc9efacf656d06efc2a328a756a1
2018-07-31 12:24:58 -07:00
Nan Zhang
a6b087b37b Merge "Revert "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from""
am: 57112d3318

Change-Id: I702f87920ab463a9b1dbcc7575de8af8e9e3c45f
2018-07-30 14:23:44 -07:00
Nan Zhang
18e28bdbee Revert "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from"
This reverts commit a3aeb54513.

Reason for revert: <This CL broke the target: aosp-master/sdk>

Change-Id: I991b696afdbaf6fb2998758b91076768e476b1ed
2018-07-30 21:07:17 +00:00
Nan Zhang
2c300ea015 Merge "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from offline-sdk"
am: a574d1c922

Change-Id: I2370f0bc1f6e8a837b1a6b72be9703d3b31cab48
2018-07-30 13:41:44 -07:00
Nan Zhang
a3aeb54513 Copy files related to sdk dev tool(activity_actions.txt, and etc.) from
offline-sdk

Originally these files were dumped to out/target/common/docs. However,
three modules(offline-sdk, offline-sdk-referenceonly, and
offline-system-sdk-referenceonly) generate these files with the same
name which might cause the problem that these files got overwritten back
and forth.

Test: m -j out/target/common/docs/offline-sdk-timestamp
Bug: b/70351683
Change-Id: I9badab5243f0d2a14bd55e561661483365b677c2
Merged-In: I9badab5243f0d2a14bd55e561661483365b677c2
2018-07-26 16:08:35 -07:00
Mads Ager
37be299ada Merge "Update version of D8 in buildtools to latest stable version (1.0.35)"
am: bb0e2b1a6f

Change-Id: I4bbbb66f833ed1536c78bbd6364341c756ff6d0a
2018-07-25 00:21:55 -07:00
Mads Ager
bb0e2b1a6f Merge "Update version of D8 in buildtools to latest stable version (1.0.35)" 2018-07-25 07:11:54 +00:00
Nan Zhang
7ef23e5e55 Merge "Use android.jar from Metalava."
am: e973f6de0f

Change-Id: I6ad90d2a1d87f99932760f41dc61dd5d4ba56be4
2018-07-24 17:06:36 -07:00
Mads Ager
0dec39ec21 Update version of D8 in buildtools to latest stable version (1.0.35)
The version used to build the platform at a given point in time
might not be the best to use for external developers. Sometimes
bugs in old VMs have to be worked around in D8. Those bugs do
not affect the platform build, but could affect other users.
Therefore, we use separate versions for building the platform
and for shipping in buildtools.

Additionally, make sure that the licenses for libraries shipped
with D8 are reflected in the buildtools NOTICE file.

Test: make -j PRODUCT-sdk_phone_armv7-win_sdk sdk_repo
Test: make -j PRODUCT-sdk_arm64-sdk sdk_repo
Bug: 111748733

Change-Id: I0ca07e45647ea95816f5e96e991673ee24ed9983
2018-07-24 06:55:59 +00:00
Tor Norbye
58ab9ef051 Use android.jar from Metalava.
This CL only affects the SDK.

It reverts commit 91967398ad
and then updates the packaging source for android.jar to
the metalava jar.

It also packages the extracted annotations, annotations.zip.

Test: Manually built various apps with android.jar file
  as well as some binary verification with javap
Bug: 78245848

Change-Id: I5614a7f5af11d12c99cf0275ae0a88d97cc0bbc7
(cherry-picked from f13bb3dab6)
2018-06-26 13:22:46 -07:00
Weilun Du
3faa84edb5 Merge "Package /data instead of userdata.img in sdk images" into pi-dev
am: fb6997e6a2

Change-Id: I0c6bf23bd8a57180b9f1a7cc7472ecf8f3b8d988
2018-05-31 23:22:41 -07:00
TreeHugger Robot
fb6997e6a2 Merge "Package /data instead of userdata.img in sdk images" into pi-dev 2018-06-01 05:01:50 +00:00
Weilun Du
963d2e05e6 Package /data instead of userdata.img in sdk images
userdata.img becomes 4GB in P and it doesn't work well with patcher in
android studio. We decided to remove userdata.img in system image zip
and generate userdata.img from /data by emulator.
Within the /data folder, we only keep /misc for the emulated WiFi.
This cl does not impact real devices.

BUG: 79925096

Change-Id: Ida3f2163cab30b38cd02a0280b5fd7abd9a66945
Signed-off-by: Weilun Du <wdu@google.com>
2018-05-30 09:33:13 -07:00
Ivan Gavrilovic
d8602da2a9 Add d8 to build tools
BUG: 74015795
Test: make -j PRODUCT-sdk_phone_armv7-win_sdk showcommands sdk_repo
Test: make -j PRODUCT-sdk_arm64-sdk showcommands sdk_repo
(cherry picked from commit e05b47b6ea)

Change-Id: I2efb3004f89c4ad9874efce3b33de0132dd6e445
Merged-In: I2efb3004f89c4ad9874efce3b33de0132dd6e445
2018-05-24 09:55:15 +01:00
Jiyong Park
3ae7694f41 Stubs lib for org.apache.http.legacy is changed to -.stubs.
Stubs lib for the sdk library org.apache.http.legacy is renamed to
org.apache.http.legacy.stubs, because the lib is now built using the
standardized build script 'java_sdk_library' where stubs libs are
suffixed with .stubs.

Bug: 77577799
Test: m -j
Merged-In: I5f45410472b0e4003d2d3cda4c9c72af8d6b4919
Change-Id: I5f45410472b0e4003d2d3cda4c9c72af8d6b4919
(cherry picked from commit 5579c00e56)
2018-05-22 20:42:10 +09:00
Jiyong Park
d06181a427 Stubs lib for org.apache.http.legacy is changed to -.stubs.
Stubs lib for the sdk library org.apache.http.legacy is renamed to
org.apache.http.legacy.stubs, because the lib is now built using the
standardized build script 'java_sdk_library' where stubs libs are
suffixed with .stubs.

Bug: 77577799
Test: m -j
Merged-In: I5f45410472b0e4003d2d3cda4c9c72af8d6b4919
Change-Id: I5f45410472b0e4003d2d3cda4c9c72af8d6b4919
(cherry picked from commit 5579c00e56)
2018-05-22 20:15:32 +09:00
Ivan Gavrilovic
9c4edf9ab3 Merge "Add d8 to build tools" am: 5e56071da1
am: a473af1733

Change-Id: I7d6fd32bb17c27247356ebc517db3142b9b7c650
2018-05-17 06:41:19 -07:00
Ivan Gavrilovic
e05b47b6ea Add d8 to build tools
BUG: 74015795
Test: make -j PRODUCT-sdk_phone_armv7-win_sdk showcommands sdk_repo
Test: make -j PRODUCT-sdk_arm64-sdk showcommands sdk_repo
2018-05-17 12:54:38 +00:00
Jiyong Park
c84e69622a javalib.jar -> classes.jar for the stubs included in SDK
I6730e2d3ec38004874265b2a690442dec57b33f4 made it clear that we should
depend on classes.jar for static java libraries. However, due to the
existing references to javalib.jar, the build system has been copied
classes.jar to javalib.jar.

But, this is not the case for Soong-defined java libraries. Instead of
doing the same thing for Soong-defined modules, directly fixing the
case where javalib.jar is being referenced.

Test: m -j dist
Bug: b/70351683
Merged-In: Ib1fb4ebdbdde42dec1028160a5473c645913d258
Change-Id: Ib1fb4ebdbdde42dec1028160a5473c645913d258
(cherry-picked Ib1fb4ebdbdde42dec1028160a5473c645913d258)
2018-04-12 15:00:41 -07:00
Guang Zhu
e6106af3c9 delete tests baked into emulator system image
am: 1c3364c022

Change-Id: Iff3f525633e56b90e1eaff7a859a4ff95edd1940
2018-04-10 10:15:13 -07:00
Guang Zhu
1c3364c022 delete tests baked into emulator system image
- tests are out of maintainence
- the checks were general functional tests on comms related
  areas and should be covered by the same tests across physical
  and virtual devices

Bug: 77496099
Test: build `make -j droid tests dist`
Change-Id: I899764846b4829add5ade8085a43bf88c958914f
2018-04-09 20:21:40 -07:00
Jiyong Park
285f698e63 javalib.jar -> classes.jar for the stubs included in SDK
I6730e2d3ec38004874265b2a690442dec57b33f4 made it clear that we should
depend on classes.jar for static java libraries. However, due to the
existing references to javalib.jar, the build system has been copied
classes.jar to javalib.jar.

But, this is not the case for Soong-defined java libraries. Instead of
doing the same thing for Soong-defined modules, directly fixing the
case where javalib.jar is being referenced.

Test: m -j dist
Merged-In: Ib1fb4ebdbdde42dec1028160a5473c645913d258
Change-Id: Ib1fb4ebdbdde42dec1028160a5473c645913d258
2018-03-30 15:49:11 +09:00
Miao Wang
ab5f4d7202 Remove mips from RenderScript toolchain
Bug: 75020967
Test: mm
Change-Id: I7ff941dc4ca9e29b9b045ecbc881165828945bd0
2018-03-15 23:37:55 +00:00
Jaegeuk Kim
bc90aff719 Merge "add sload_f2fs to Android SDK build-tools" am: 1e6a2ab589 am: 7a7ca35460
am: b7c45d308c

Change-Id: I03727e5ed67710fad3b18de11e47ba1f42efa759
2017-12-08 17:01:36 +00:00
Jaegeuk Kim
619723d2e6 add sload_f2fs to Android SDK build-tools
Change-Id: Iaaec0cbf6a2b43147a75077db9c91ae10cccc668
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2017-12-06 11:16:20 -08:00
Jin Qian
b6f19b4836 Merge "add mke2fs.conf to Android SDK build-tools" am: fafa867f81 am: c933ed0bef
am: 3741f7c9e8

Change-Id: Ic603d23b7f79789bf139edfc15eb200a9608ae60
2017-12-06 03:12:32 +00:00
Treehugger Robot
fafa867f81 Merge "add mke2fs.conf to Android SDK build-tools" 2017-12-06 00:28:32 +00:00
Jin Qian
d941e81fb2 add mke2fs.conf to Android SDK build-tools
Change-Id: I37822f5917986a562a48b5ad199623dbef61cdeb
2017-12-05 11:52:15 -08:00
Paul Duffin
33b4ede5a5 Add stubs for android.test.base
Adds android.test.base.jar to the optional directory of the SDK.

Bug: 30188076
Test: build SDK and check optional directory

Change-Id: Idef6358ea435053ee08831cefa8be5d07c9c6f74
2017-11-29 10:48:30 +00:00
Jaegeuk Kim
fb9048e9a4 Merge "add make_f2fs to Android SDK build-tools" am: ea2eb3b92a am: ce37c10e23
am: 3c8276cfac

Change-Id: Id7779f9e50bc48503c94e259bbdac3511d93005a
2017-11-27 19:28:56 +00:00
Jaegeuk Kim
4d6488e357 add make_f2fs to Android SDK build-tools
fastboot calls make_f2fs to format f2fs partition.

Bug: 67009570
Bug: 69298953
Change-Id: I47491d814b44f7235e61348e8cb177b1431a935f
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2017-11-15 08:42:16 -08:00
Jaegeuk Kim
656dd61384 Merge "Revert "add make_f2fs to Android SDK build-tools"" am: 15c31de13d am: e499792706
am: 9c929cb2e9

Change-Id: I1d6871294d16444ee50201faf399318869f876bd
2017-11-14 03:24:26 +00:00
Jaegeuk Kim
dd17f5ee85 Merge "add make_f2fs to Android SDK build-tools" am: b4131febb3 am: 4afe3c728f
am: 9921aac979

Change-Id: I61b0012835c16277fbc0c51e656eda8974e118a4
2017-11-14 03:23:09 +00:00
Jaegeuk Kim
da8a8af86f Revert "add make_f2fs to Android SDK build-tools"
Broken build in Mac.

This reverts commit 54d441cd8b.

Change-Id: Ide67e312b988ccf6298d18593e5b9c78f950fdd8
2017-11-14 02:58:42 +00:00
Paul Duffin
317f8c8372 Add stubs for android.test.mock, android.test.runner
Adds android.test.mock.jar and android.test.runner.jar to
the optional directory of the SDK.

Bug: 30188076
Test: build SDK and check optional directory
Change-Id: I6fb0d8757c4b157ff2167f8fc4e50ff019449beb
2017-10-31 13:48:21 +00:00
bohu
9fdedf9df7 emulator: merge oc-emu-dev development project
BUG: 64401460

Change-Id: I3fdce5c8aeb4fccb52d04f5da69807da9c86d57a
Merged-In: I3fdce5c8aeb4fccb52d04f5da69807da9c86d57a
Merged-In: I9f757a14d9bb59db2e6c62f4a4c83a4373b7b4d6
2017-10-26 22:08:12 -07:00
Jaegeuk Kim
54d441cd8b add make_f2fs to Android SDK build-tools
fastboot calls make_f2fs to format f2fs partition.

Bug: 67009570
Change-Id: I221f2cfa11303c1866f8c8396bb7a1e0080fec6d
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2017-10-18 15:59:38 -07:00
Treehugger Robot
0e82eea2d4 Merge "Delete jack support" 2017-10-03 01:17:24 +00:00
Colin Cross
f354e34a0f Delete jack support
Remove references to jack files that no longer exist.

Bug: 65302138
Test: m PRODUCT-sdk_phone_x86_64-sdk dist sdk_repo
Change-Id: I6e68fbffc49362ec691db966032e8e01d5f01756
Merged-In: I6e68fbffc49362ec691db966032e8e01d5f01756
(cherry picked from commit cfcfb28d9a)
2017-10-02 14:05:23 -07:00
Colin Cross
8b34196af3 Delete jack support
Remove references to jack files that no longer exist.

Bug: 65302138
Test: m PRODUCT-sdk_phone_x86_64-sdk dist sdk_repo
Change-Id: I6e68fbffc49362ec691db966032e8e01d5f01756
Merged-In: I6e68fbffc49362ec691db966032e8e01d5f01756
(cherry picked from commit cfcfb28d9a)
2017-10-02 21:04:28 +00:00
Colin Cross
387a987001 Merge "Delete jack support" 2017-10-02 21:03:41 +00:00
Colin Cross
cfcfb28d9a Delete jack support
Remove references to jack files that no longer exist.

Bug: 65302138
Test: m PRODUCT-sdk_phone_x86_64-sdk dist sdk_repo
Change-Id: I6e68fbffc49362ec691db966032e8e01d5f01756
2017-10-02 12:27:22 -07:00
Ivan Gavrilovic
7dff189570 Merge "Add shrinkedAndroid.jar to build tools" am: 1a9b850c50 am: a578e61335
am: 8f6ccd2e01

Change-Id: I58279783d9242b874d77147bc5770c204e3f62a5
2017-10-02 10:05:00 +00:00
Ivan Gavrilovic
a578e61335 Merge "Add shrinkedAndroid.jar to build tools"
am: 1a9b850c50

Change-Id: I4a3da887d12d3d674e79610cd844015706d7c1b8
2017-10-02 10:01:12 +00:00
Ivan Gavrilovic
b6d3f47313 Add shrinkedAndroid.jar to build tools
Test: built the sdk locally
Change-Id: Ifb2a88e715b4bb2f1077aaed4fd724b3a13cbe2d
2017-09-28 17:23:42 +01:00
Colin Cross
ffef1f1727 Merge "Revert "Use shrinkedAndroid.jar from OUT for build tools"" am: 039d8dbd73 am: 4bc7e6a23e
am: 718e29542a

Change-Id: I6e19c69504c03d1b708bc7eecd5fc85d6477b93f
2017-09-27 03:35:16 +00:00
Colin Cross
4bc7e6a23e Merge "Revert "Use shrinkedAndroid.jar from OUT for build tools""
am: 039d8dbd73

Change-Id: I5f3fc291eab9e2b5fc54d09b218e0fac6cf7836d
2017-09-27 03:30:05 +00:00
Colin Cross
039d8dbd73 Merge "Revert "Use shrinkedAndroid.jar from OUT for build tools"" 2017-09-27 03:24:44 +00:00
Colin Cross
c9ae20b54e Revert "Use shrinkedAndroid.jar from OUT for build tools"
This reverts commit 63cc4a06e5.

Change-Id: Idf5f124f7f920a53488852cb7cae8d67eff29c45
2017-09-27 03:24:17 +00:00
Ivan Gavrilovic
7c93f61e10 Merge "Use shrinkedAndroid.jar from OUT for build tools" am: b959fe4863 am: cc2ede2f6b
am: ec4b55de72

Change-Id: I3354345c16d6423d32218c363c1b7c58cd325d4f
2017-09-27 00:30:34 +00:00