Commit Graph

1318 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
c35a0c7ae3 Merge "Wrap private-stub-annotations in android.jar"
am: d5814e0760

Change-Id: I81934dfe8a6fac2958f5efe1663bf35c1c35d006
2018-07-24 17:06:52 -07:00
Nan Zhang
7ef23e5e55 Merge "Use android.jar from Metalava."
am: e973f6de0f

Change-Id: I6ad90d2a1d87f99932760f41dc61dd5d4ba56be4
2018-07-24 17:06:36 -07:00
Nan Zhang
d5814e0760 Merge "Wrap private-stub-annotations in android.jar" 2018-07-24 22:44:12 +00:00
Nan Zhang
e973f6de0f Merge "Use android.jar from Metalava." 2018-07-24 22:44:12 +00: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
Nan Zhang
b78c3a22f7 Wrap private-stub-annotations in android.jar
Test: javap -classpath classes.jar androidx.annotation.RecentlyNullable
Compiled from "RecentlyNullable.java"
interface androidx.annotation.RecentlyNullable extends java.lang.annotation.Annotation {
}
Bug: b/78245848

Change-Id: Ie28dea72e8795277e78a8fb0ff2173ab60c31078
2018-07-13 16:39:19 -07:00
David Brazdil
0ab65b3182 Merge "Compile API stubs to dex"
am: 252f328bc9

Change-Id: I7d9d0207b94cd65de74084fb38054e0ffdc89d81
2018-07-10 09:15:23 -07:00
David Brazdil
51c1288030 Compile API stubs to dex
Add 'compile_dex' flag to API stub rules. Soong will generate build
targets which compile the JARs into dex files. Those will be compared
against the boot class path dex files to determine the public API surface.

Bug: 79409988
Test: m android_stubs_current, check javalib.jar contains classes.dex
Change-Id: Ie7238572ece0678133ba08203108a923ea2f56ba
2018-07-10 10:31:11 +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
Nan Zhang
a993c3a7d4 Merge "Add Metalava based android.jar targets in Androi.bp"
am: e7636d2e30

Change-Id: I1d6ea588270c472ec29d7164b0b50cdd062a1a22
2018-06-18 12:09:40 -07:00
Treehugger Robot
e7636d2e30 Merge "Add Metalava based android.jar targets in Androi.bp" 2018-06-18 16:55:28 +00:00
Dan Willemsen
dc5dc10dcd Merge "Convert implicit make rules to static pattern rules"
am: 56ded7fe40

Change-Id: I7aa17d859e487b0b7e9d4b7af0cf1e4c2a7ff02f
2018-06-16 14:47:23 -07:00
Dan Willemsen
55a8f53068 Convert implicit make rules to static pattern rules
Implicit rules are being deprecated, so explicitly specify which targets
to apply the pattern rules against.

Test: build-aosp_arm.ninja is identical before/after
Change-Id: I0b902dbbfa7a70abcdcce5ea1954e9e4fad25367
2018-06-16 10:41:44 -07:00
Nan Zhang
b28bc7e67c Add Metalava based android.jar targets in Androi.bp
Test: m -j metalava_android_stubs_current
Bug: b/78245848
Change-Id: I5720659a72a91a08aebc4631e23001384fdf8264
2018-06-13 17:47:05 -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
Anton Hansson
add2d257b0 Merge "development: Update path to android.jar." am: 87cc3e369c
am: 7c9ea6b065

Change-Id: I5ee534d8ee7ffd676a75298695221c18b1ecff73
2018-05-02 09:28:48 -07:00
Anton Hansson
8447737005 development: Update path to android.jar.
This file is being moved. Update this path so that the old file ca be
deleted.

Bug: 77525052
Test: make out/host/linux-x86/development/sdk/generated-api-versions.xml
Change-Id: I3802304a69cc21be26e13de63c5d459b803052dd
2018-05-01 17:53:55 +01:00
Isaac Chen
2946ac6a76 emulator: 64-bit kernel for 32-bit arm image
Starting in P, all 32-bit and 64-bit architectures use 64-bit
binder interface. This is similar to ag/3582011 for x86.

Bug: 71861550
Test: lunch sdk_phone_armv7-userdebug; m -j; emulator
Change-Id: I152a89ba46e81f27bde0e166cb224d2a740fc989
Merged-In: I152a89ba46e81f27bde0e166cb224d2a740fc989
(cherry picked from commit 50df6f5934)
2018-04-24 18:33:54 +08:00
bohu
6f44bb82fc emulator: uses 4.9 kernel
am: e1593add45

Change-Id: I9f42a93366ff936bff7615ec9e29f583b5e3b96c
2018-04-20 18:30:38 -07:00
bohu
e1593add45 emulator: uses 4.9 kernel
BUG: 78272519
this cl does not impact real devices

Change-Id: I2ff221acbb5fad03d374da771337f927bfbfc857
2018-04-20 09:59:13 -07:00
Isaac Chen
185f941ce1 Merge "emulator: 64-bit kernel for 32-bit arm image" into pi-dev
am: 6fb5c38bdd

Change-Id: Ia5f8b3c979e757692b066b7367b3d8fefa629a7e
2018-04-16 22:29:14 -07:00
TreeHugger Robot
6fb5c38bdd Merge "emulator: 64-bit kernel for 32-bit arm image" into pi-dev 2018-04-17 05:22:35 +00:00
Colin Cross
67d1b744dd Merge "Add java_system_modules for current sdk stubs" am: d0f0748c96
am: 44707a50f8

Change-Id: Iaac73e53760a4e5fc9b95fa9e61aa2fc0eacd9dd
2018-04-15 12:56:51 -07:00
Treehugger Robot
d0f0748c96 Merge "Add java_system_modules for current sdk stubs" 2018-04-15 19:38:30 +00:00
Colin Cross
9b0d510e08 Add java_system_modules for current sdk stubs
Building with -target 1.9 requires system modules to use in place
of the bootclasspath, add java_system_modules to generate them.

Test: m EXPERIMENTAL_USE_OPENJDK9=true
Change-Id: I3f54b987efa528078b1e34b743137540c69edf74
2018-04-13 17:38:47 -07:00
Treehugger Robot
9e847302b4 Merge "javalib.jar -> classes.jar for the stubs included in SDK" 2018-04-13 17:28:22 +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
Jiyong Park
3e255758be 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: Iabd04ba55411373c228ca4bf04fc99b7f155262c
Change-Id: Iabd04ba55411373c228ca4bf04fc99b7f155262c
(cherry-picked from cdd757f4da)
2018-04-12 14:56:19 -07:00
Isaac Chen
50df6f5934 emulator: 64-bit kernel for 32-bit arm image
Starting in P, all 32-bit and 64-bit architectures use 64-bit
binder interface. This is similar to ag/3582011 for x86.

Bug: 71861550
Test: lunch sdk_phone_armv7-userdebug; m -j; emulator
Change-Id: I152a89ba46e81f27bde0e166cb224d2a740fc989
2018-04-12 16:29:58 +08: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
Jiyong Park
e43dd95e8f 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: Iabd04ba55411373c228ca4bf04fc99b7f155262c
Change-Id: Iabd04ba55411373c228ca4bf04fc99b7f155262c
2018-03-30 15:49:03 +09:00
Nan Zhang
2361dfb2ab Merge "Set java_version:1.8 for Android stubs jar generation" am: ac031893f4
am: 8c47220f30

Change-Id: I5be21ec1f2861915c1a650e6adefbb160eb8f854
2018-03-22 05:20:55 +00:00
Nan Zhang
7bec487c2a Set java_version:1.8 for Android stubs jar generation
Currently Soong based Android stubs jar generation is broken
when EXPERIMENTAL_USE_OPENJDK9=true with following errors:
"Unable to find package java.lang in classpath or bootclasspath"

In old development/build/build_android_stubs.mk
all these jar targets were forced to be built with -source 1.8 -target
1.8
https://android-review.googlesource.com/c/platform/development/+/630280

Test: m android_stubs_current EXPERIMENTAL_USE_OPENJDK9=true
Bug: b/70351683

Change-Id: Ice0224a97e458f92e5b4c5994fa67079d2788d57
2018-03-21 17:47:06 -07:00
Nan Zhang
1c7b1a13bd Generate Soong based (system/test_)stubs_current jar
And remove build_android_stubs.mk
Bug: b/70351683

Test: m soong_android_stubs_current
cp out/soong/.intermediates/development/build/soong_android_stubs_current/android_common/combined/soong_android_stubs_current.jar new/ &&
cp out/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/classes.jar old/ &&
cd new/; find . -type f -name "*.class" -exec md5sum {} \+ | ( cd old; md5sum -c --quiet )

zipinfo > entries.toc, results are identical.

Change-Id: I24013e20481392e15ef6362c5cc239740531625f
Merged-In: I24013e20481392e15ef6362c5cc239740531625f
2018-03-20 16:23:36 -07:00