Commit Graph

1424 Commits

Author SHA1 Message Date
David Gross
cb255acf77 Remove old GNU linkers from SDK.
Linkers aarch64-linux-android-ld and x86_64-linux-android-ld were built
with a minimum macOS deployment target lower than 10.9, so they cannot
be signed and notarized.  Rather than try to produce newer versions of
these linkers (which are obsolete in the SDK anyway), we remove them (so
that all of the SDK can be signed and notarized).  Rather than introduce
an inconsistency among the linkers for a particular host (there are
three other GNU linkers that don't have this problem) or across hosts
(there are no issues on linux or windows), we remove all of the GNU
linkers, not just the two problematic ones.

Only newer gradle plugins (those that look for the clang linker lld)
will work with the new SDK from which those old linkers have been
removed.

Bug: 152337684

Test: (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo
      (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug win_sdk dist sdk_repo
      Inspect sdk-repo-{linux,windows}-build-tools-eng.*.zip
Change-Id: Iccfa870a826de3f12c99175e0761ea00fe2876ed
2020-03-30 11:08:31 -07:00
Aurimas Liutikas
3219aad274 Move to framework-doc-stubs module for versions xml and annotations
api-versions.xml and annotations.zip will now be taken from framework-doc-stubs
module so that api-stubs-docs can stop generating them.

Test: lunch sdk; make sdk
Bug: 151160048
Change-Id: I35fdba553318098a09249f47d7d78cdef79f3898
Merged-in: I35fdba553318098a09249f47d7d78cdef79f3898
2020-03-23 18:53:17 +00:00
Anton Hansson
b4aca10721 Add module_lib and system-server artifacts to sdk dist
Makes these artifacts available for the update_prebuilts script.

Bug: 149293194
Test: m win_sdk dist && find out/dist -type f
Change-Id: Icd91da0976f24eb1b4ea1eeaebb96398990f760e
2020-03-19 19:20:32 +00:00
Colin Cross
359ef3d028 Fix lld prebuilts locations
prebuilts/sdk/tools is updated from the zip file built by the SDK.
The lld binaries are copied from the prebuilts to the zip file, and
were moved in the zip file, which meant the next time the prebuilts
were updated the wrong files were copied.

Fixes: 151729229
Test: m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug out/host/linux-x86/sdk/sdk_phone_armv7/repo-sys-img.xml sdk sdk_repo
Change-Id: I2de182f3cbf739dbd9c6a5287e1416ea37d2899f
2020-03-17 16:23:55 -07:00
David Gross
f879b7a53c For darwin, add lib64/libc++abi.1.dylib.
libc++.1.dylib, which was already added, depends on this.

Bug: 148267171
Bug: 142590626
Bug: 144040336
Test: N/A
Change-Id: Ifd5b2db7b18a29c1b58b408118951792733649b7
2020-03-11 15:25:20 -07:00
David Gross
24e52959d7 Move lld.exe (windows) and add dependent library libwinpthread-1.dll
Move lld.exe to lld-bin directory; add lld-bin/libwinpthread-1.dll; add
trampoline.

Best practice is to ship necessary libraries of expected versions along
with build tools, rather than requiring them to be found elsewhere.

lld.exe depends on libwinpthread-1.dll and windows looks for it in the
same directory as lld.exe.  Unfortunately, there's already a 32-bit
libwinpthread-1.dll at the tool root (used by 32-bit executables at
the tool root), and lld.exe is a 64-bit executable, so it needs its own
directory and its own library.

In the old location of lld.exe, we add a trampoline executable (a build
artifact) in lld-bin; this means Gradle, which invokes lld.exe in the old
location, does not have to change.

Bug: 148267171
Bug: 142590626
Bug: 144040336

Test: (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo
      (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug win_sdk dist sdk_repo

Change-Id: Ice6710ed204a25d09ac596207c02b8b99ca95b8b
2020-03-02 17:45:53 -08:00
David Gross
e9351e5061 Move lld (darwin, linux) and add dependent libraries
darwin: Move lld to lld-bin directory; add lib64/libc++.1.dylib; add trampoline

linux: Move lld to lld-bin directory; add lib64/libc++.so.1; add trampoline

Best practice is to ship necessary libraries of expected versions along
with build tools, rather than requiring them to be found elsewhere.

lld depends on libc++.1.dylib (darwin) or libc++.so.1 (linux) and looks for it
in ../lib64, so we need to move lld to an appropriate relative location.
In the old location of lld, we add a simple bash trampoline to invoke
lld in lld-bin; this means Gradle, which invokes lld in the old
location, does not have to change.

Bug: 148267171
Bug: 142590626
Bug: 144040336

Test: (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo
      (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug win_sdk dist sdk_repo
Change-Id: I69b4ef79208bd7d06a377c0761671f1b572abced
2020-02-27 15:14:28 -08:00
Roman Kiryanov
637b6bcaa5 emulator: switch x86* to 5.4 kernel
Bug: 147493341
Test: boot
Merged-In: Iad0ce71c34cc55c858b24598120bf01d91e10aa1
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I077bcbd27333af53b64b274928c264cb649676c0
2020-02-25 10:00:30 -08:00
Jiyong Park
f371ec46ec Move android_*_stubs_current modules to frameworks/base
frameworks/base/StubLibraries.bp is the place where the droidstubs and
java_library modules for the API stub libraries are defined.

Bug: N/A
Test: m
Change-Id: I407d0d939582841ffa651488bf76667ab7ce9c64
2019-12-20 18:54:12 +09:00
Automerger Merge Worker
24569974e4 Populate SDK with clang linker (lld) in addition to GNU linker. am: c22ed0eece am: c2151407b3 am: f9f9c88b7e am: cba54f1de6
Change-Id: Ic2f5cdae12afdd6f44fef494f58fae250592a92d
2019-12-19 00:35:33 +00:00
Automerger Merge Worker
cba54f1de6 Populate SDK with clang linker (lld) in addition to GNU linker. am: c22ed0eece am: c2151407b3 am: f9f9c88b7e
Change-Id: I7caeaab4c4f1cd824b17deb3d16e11bbc258453a
2019-12-19 00:19:12 +00:00
David Su
c59aada07d Compile android_system_stubs_current against core_current
Mainline modules, and all their recursive dependencies,
should depend on sdk_version=core_current.
android_system_stubs_current is needed to provide
updatable @SystemApi's to framework-system-stubs since
framework-system-stubs only contains non-updatable
@SystemApi's. Since framework-system-stubs needs to be
built against core_current, so does
android_system_stubs_current.

Bug: 139391334
Test: compiles
Change-Id: Iabecd6bbab20e80b0cb1fc68dc42cbe7c2722a03
2019-12-11 17:39:30 -08:00
David Gross
c22ed0eece Populate SDK with clang linker (lld) in addition to GNU linker.
Note that clang linker is multi-target whereas GNU linker is
single-target; so while we need multiple GNU linkers (because we
support multiple targets) we only need a single clang linker.

We retain the GNU linkers so that a new SDK is still compatible with
older gradle plugins.

Bug: 142590626
Bug: 144040336

Test: (gLinux) m PRODUCT-sdk_phone_armv7-sdk dist sdk_repo
      (gLinux) m PRODUCT-sdk_phone_armv7-win_sdk dist sdk_repo

Change-Id: I2a04f6fd464b5eb6a2e9a632f49409c1d7e60170
2019-11-27 17:20:54 -08:00
Jerome Gaillard
404f66903c Some files for the SDK are now built in a different place
This updates the origin location of some files because they are now
generated in a different way and so end up in a different folder.

Bug: 142480924
Test: m sdk
Change-Id: I2dafafc113e7e5c77d469b69b7fe9f25cc0555b1
Merged-In: I2dafafc113e7e5c77d469b69b7fe9f25cc0555b1
2019-11-18 10:39:40 +00:00
bohu
411df3f8ce Merge "sdk: remove whitelist for deployagent" am: 73fae42b6f am: 313307b0b1 am: e86ea82e50
am: 338e0589fa

Change-Id: I97443306c6d0b6322d5631b06b8bdf1397802bf2
2019-10-27 10:12:01 -07:00
bohu
308976f8a7 sdk: remove whitelist for deployagent
Change-Id: Ib52e82091f251a96ccaa3af031e047f5a236fb2e
2019-10-25 14:10:07 -07:00
bohu
778e6f72f7 Merge "Development: remove deployagent" am: 90ceb51d8f am: 72325edad9 am: ba6f861371
am: 117effa6d8

Change-Id: I5f4ef576859a6daa4fd5098871fdefa94d524ee0
2019-10-23 16:26:11 -07:00
bohu
218e42e813 Development: remove deployagent
Change-Id: I794cf3913eff6e8bf4fa0de55708ae154bfe8e8a
2019-10-23 13:02:20 -07:00
Jerome Gaillard
233f53ec93 Merge "Some files for the SDK are now built in a different place" am: 2e9d2a0112 am: 085de0e20f am: 11d3bb7fb7
am: 59faa1bf7f

Change-Id: I35d164715d2ac3bdd1fce13efed805abfe661cce
2019-10-21 05:14:28 -07:00
Jerome Gaillard
52633e91d1 Some files for the SDK are now built in a different place
This updates the origin location of some files because they are now
generated in a different way and so end up in a different folder.

Bug: 142480924
Test: m sdk
Change-Id: I2dafafc113e7e5c77d469b69b7fe9f25cc0555b1
2019-10-17 13:55:53 +01:00
Elliott Hughes
e011551a05 Merge "sdk_clean.sh: the mac is now using the same sed as linux." am: 5502f2c591 am: e8ae12f12a am: c847d216ca
am: f0f236b337

Change-Id: I77705040dc2878130d5edb31b1bf0061c74f8447
2019-10-09 17:45:38 -07:00
Elliott Hughes
80c8559132 sdk_clean.sh: the mac is now using the same sed as linux.
Test: builds
Change-Id: I783287d9a7ee7c3157a6275f011dbf05653c5a62
2019-10-09 12:24:59 -07:00
Jerome Gaillard
995f03c2ca Do not ship layoutlib in the SDK
Layoutlib and all the necessary resources have shipped in Android Studio
for some time, so it is not necessary to have them included in the SDK.

Bug: 142046954
Test: N/A
Change-Id: Ic1192fee7296a1e29f0d314fe299f0e105c93c45
2019-10-03 14:37:08 +01:00
Bo Hu
8adc968a76 Merge "Add whitelist to build/product_sdk.mk" am: 62cb157dec am: eec0f0044d am: c186f7a2de
am: 2dfabcf4b2

Change-Id: I9fa04db6dd820a24f3e198e9f9adb526297227e2
2019-09-09 20:41:34 -07:00
bohu
f76143d8bb Add whitelist to build/product_sdk.mk
BUG: 134444564
Change-Id: I43b26ee3de605fca440d70b5d26d8186a7d7ad4f
2019-09-06 15:35:15 -07:00
Elliott Hughes
c1791675fa Merge "Remove macOS-specific workaround." am: e5be747906 am: 6f92a637bd am: 04eb0f1801
am: ba59db4045

Change-Id: I49396f8587046cfa96e49ecd739ca5be6736613c
2019-09-06 14:32:10 -07:00
Elliott Hughes
046f45a04e Remove macOS-specific workaround.
We now use the same stat on macOS as on Linux, so this breaks the build.

Test: treehugger
Change-Id: I1a9ef44d9cef17b5a4df068e86d1c1208fc19d11
2019-09-06 09:28:20 -07:00
Joshua Gilpatrick
2ec693be92 Merge "Remove fastdeploy agent files" am: 995770b91c am: 4f33560912 am: 4cf138fb13 am: 97ed97c2e5
am: ac9b4eaddc

Change-Id: I79d8f3b672734575aade60c8e7e027893d649e0c
2019-07-30 16:46:49 -07:00
Joshua Gilpatrick
8b36def7bd Remove fastdeploy agent files
These files are now embeded into the binary and pushed as needed.
Test: None
Bug: 138130943
Change-Id: Icda72bf674ceb8ab7971110723af3458881b4618
2019-07-29 10:06:00 -07:00
Paul Duffin
f2428dd3d7 Merge "Switch from no_standard_libs:true to sdk_version:"none"" am: c581ff5e7d am: c661f9e765 am: e49b5bd4a1
am: 769d8a8336

Change-Id: I6c940cd2560ca000d4c403220ec40d847e857fcb
2019-06-17 03:33:22 -07:00
Paul Duffin
c581ff5e7d Merge "Switch from no_standard_libs:true to sdk_version:"none"" 2019-06-17 09:57:12 +00:00
Weilun Du
cf38547d4e Merge "[Advanced Features] Change the source location of advancedFeatures.ini" am: 08a2bdae08 am: e1b1481200 am: 83caa43303
am: edb9a8f644

Change-Id: Ia73161a2e4b629b3b1afcacd0c9837749bd69a85
2019-06-13 14:38:17 -07:00
Weilun Du
c1084c0534 [Advanced Features] Change the source location of advancedFeatures.ini
Copy advancedFeatures.ini file from
device/generic/goldfish/data/etc, which is the centralized place for
advancedFeatures.ini.

BUG: 135187406

Change-Id: Ib1d2ec2f91d66dde89bc4a884cd99dbb1a2c83cb
Signed-off-by: Weilun Du <wdu@google.com>
2019-06-13 09:57:42 -07:00
Paul Duffin
df0d7dfff1 Switch from no_standard_libs:true to sdk_version:"none"
The no_standard_libs property is deprecated in favor of
sdk_version:"none" as the latter is simpler and less error prone.

Bug: 134566750
Test: m droid
Change-Id: I410e4b98481cec1a5512cd138f735038a725287b
2019-06-13 10:22:17 +01:00
bohu
edb348c7c2 emulator: disable system-on-root and kernelBlob support
BUG: 125540538

Change-Id: I68895c39c4f48f53077a4e766718c63b1d1da91a
Merged-In: I68895c39c4f48f53077a4e766718c63b1d1da91a
2019-05-03 03:37:21 +00:00
bohu
6bceabf81d emulator: support dynamic partition
BUG: 125540538

Change-Id: I68895c39c4f48f53077a4e766718c63b1d1da91a
Merged-In: I68895c39c4f48f53077a4e766718c63b1d1da91a
2019-05-02 15:40:54 -07:00
Bo Hu
1006cf000a Merge "emulator: disable system-on-root and kernelBlob support" into qt-dev-plus-aosp
am: b2dc05d5f4

Change-Id: Ib3796407e1740e733490d526e2beda253f0f8e59
2019-05-02 13:44:08 -07:00
bohu
fb1161c429 emulator: disable system-on-root and kernelBlob support
BUG: 125540538

Change-Id: I68895c39c4f48f53077a4e766718c63b1d1da91a
2019-05-02 15:50:33 +00:00
Colin Cross
a248f4af4c Package framework.aidl produced by Soong
Bug: 130798034
Test: forrest
Change-Id: Ie5606eeace783b09e822b7045880f57f7fb8dab1
Merged-In: Ie5606eeace783b09e822b7045880f57f7fb8dab1
(cherry picked from commit 76aa9e1b65)
2019-04-22 09:58:10 -07:00
Colin Cross
81971b4e23 Merge "Package framework.aidl produced by Soong" am: f504f3a6ba am: 619cad04f9
am: 66b8c2e2bb

Change-Id: I07ad38f3356a4df1cf1ba2bf2f1617d0680c1240
2019-04-21 10:52:35 -07:00
Colin Cross
76aa9e1b65 Package framework.aidl produced by Soong
Bug: 130798034
Test: forrest
Change-Id: Ie5606eeace783b09e822b7045880f57f7fb8dab1
2019-04-18 12:10:41 -07:00
bohu
5abed79791 emulator: uses 4.14 for x86[_64]
BUG: 129274443
Change-Id: Ia24a85203c39cf829ae96fda1f0ccc41b104816f
2019-04-15 15:27:44 -07:00
diegoperez
b59621013c Limit size of arguments passed to line_endings
This avoids the call to line_endings failing with "argument list too
long".

Test: make sdk
Change-Id: I1ff222ede731e5ca0bb6361801560a96e6e1f586
2019-04-10 17:30:35 +01:00
Dan Willemsen
fc18446715 Merge "Remove host packages from PRODUCT_PACKAGES" am: c4f99b56ec am: 4a406e583f
am: 8e3c7c7c6f

Change-Id: I8ab4671aff49bc47e257a8ca5c34c53f66017a9e
2019-03-19 14:43:51 -07:00
Dan Willemsen
9db29322e7 Remove host packages from PRODUCT_PACKAGES
I only left deployagent in PRODUCT_PACKAGES, since that was the only
device-only module. I'm assuming that we only cared about the host
versions of any host-and-device modules in this file.

Test: treehugger
Change-Id: I8b84c20570e313b20f5c8d87417b75943ea3d345
2019-03-19 11:12:42 -07:00
Jaewoong Jung
3f844bdfa2 Merge "Recompress android.jar before packaging it." am: 104232e0fc am: 9fc8db483a
am: 94ab1ccfcf

Change-Id: Ifd4e73e497eac9e8131de44af2fe9a7f645f526b
2019-03-14 10:41:04 -07:00
Jaewoong Jung
3626b04613 Recompress android.jar before packaging it.
This is to circumvent an issue where Q SDK release causes a problem to
developers who are stuck with an old Gradle version.

Fixes: 127733650
Test: m sdk & inspect android.jar size and contents
Change-Id: I52a211f57afba1b6d656bba2082e806481ef41c2
2019-03-14 07:30:54 -07:00
Dan Willemsen
07c85b0668 Add PRODUCT_HOST_PACKAGES for all host modules in PRODUCT_PACKAGES
In preparation for splitting PRODUCT_HOST_PACKAGES and PRODUCT_PACKAGES

Removes references to emmalib and jython which don't exist.

Test: treehugger
Change-Id: I830ea918dca5766a8269aa1cd38f26cdb1c18969
Merged-In: I830ea918dca5766a8269aa1cd38f26cdb1c18969
2019-03-06 15:36:52 -08:00
Roman Kiryanov
f45d6f32c1 Switch goldfish back to 4.14 kernel
Bug: 124250110
Test: b/124250110
Change-Id: I47597f2bacc2f73783bc3f4b817955083610f8cc
Signed-off-by: Roman Kiryanov <rkir@google.com>
2019-02-26 13:41:53 -08:00
Dan Willemsen
b22fe69ce3 Add PRODUCT_HOST_PACKAGES for all host modules in PRODUCT_PACKAGES
In preparation for splitting PRODUCT_HOST_PACKAGES and PRODUCT_PACKAGES

Removes references to emmalib and jython which don't exist.

Test: treehugger
Change-Id: I830ea918dca5766a8269aa1cd38f26cdb1c18969
2019-02-20 20:30:30 -08:00