Commit Graph

33 Commits

Author SHA1 Message Date
David Gross
940757220e Place a dummy file at the location of each (previously removed) old GNU linker
Previously, old GNU linkers were removed, in favor of the LLVM linker
lld.  However, old versions of AGP consider the absence of those linkers
to mean that the build tools are corrupted.  To solve this problem, we
provide a (non-executable) dummy file in place of each old GNU linker to
keep AGP satisfied.  A compatibility mode RenderScript build by those
old versions of AGP will fail (as it would have without the dummy
files), but everything else should work.

Bug: 153685081
Bug: 144040336
Bug: 142590626

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: I7574c850bfb593df5bcb9131ea8915061b0083e1
2020-04-29 14:26:10 -07:00
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
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
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
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
Pirama Arumuga Nainar
9c060eeb11 Use the LLVM libs with "_android" suffix
The LLVM libraries used for RenderScript have been changed to include
the "_android" suffix.

Test: make PRODUCT-sdk_x86-sdk dist sdk_repo
Change-Id: If328eac65c78877d608f097ec18f6197a17df804
2017-11-09 15:53:43 -08:00
Adam Lesinski
8bb66e66d1 Add libaapt2_jni to SDK build
Test: manual check
Change-Id: I5cfdf10d64f60acdc507749fe9b9ab456dd826ee
2016-11-08 11:39:47 -08:00
Miao Wang
a62e9d2df1 Add x86_64 linker to Build-Tools for RenderScript.
Bug: 27972043
Change-Id: Icc4213d16f43019fe731690656c95cb5b6a74430
2016-05-10 14:42:54 -07:00
Miao Wang
75b8fb738f [RenderScript] Add arm64 prebuilts to BuildTools am: 4d6b8c48b6 am: c01d0fc70e am: 356d779616
am: b82c47c128

* commit 'b82c47c1285676e6127510d9afbe593c01172cb1':
  [RenderScript] Add arm64 prebuilts to BuildTools
2016-02-13 02:03:15 +00:00
Miao Wang
4d6b8c48b6 [RenderScript] Add arm64 prebuilts to BuildTools
Bug: 27107290

 - Fix arm64 RS compat mode compilation.

Change-Id: I6cdcb86e412e490ca159132d41d99d0d4ae75c15
2016-02-09 20:22:44 -08:00
Ying Wang
896afb075d resolved conflicts for merge of 0f32d65d to mnc-dr-dev-plus-aosp
Change-Id: I5be45feb780c67c08dbef035f2f6481ae6338f90
2015-08-03 11:36:50 -07:00
Ying Wang
fca823453b Switch to 64-bit host tools in Linux/Mac SDK build.
Bug: 22776595
Change-Id: Iadf56f045f6920d4e97c8b1219b1b3907213b12b
2015-07-31 13:38:57 -07:00
Xavier Ducrohet
f4c73da84f Update structure for the build-tools/plat-tools.
Change-Id: Idf0d8cd41812ca92d8bb6910c4bd7d64eaaff51a
2015-06-02 11:20:00 -07:00
Xavier Ducrohet
7d6d0d4ebb Fix build tools packaging.
Move exe under bin/ and the libraries under lib/

Change-Id: Id9fa6bf921e69810f92876623bd69302e85f7a61
2015-05-20 08:55:03 -07:00
Ying Wang
87f01085fe Update prebuilts path.
Bug: 20239510
Change-Id: Id2c699fb516d55deceffd8194a485b078564c8de
2015-04-23 10:00:15 -07:00
Ying Wang
07dd2eb7e6 Update prebuilts path.
Bug: 20239510
Change-Id: Id2c699fb516d55deceffd8194a485b078564c8de
2015-04-15 12:31:49 -07:00
Dan Albert
b7125622c8 Fix library paths for SDK tools.
The rpath for the binaries is ../lib but the libraries were being
installed to the same directory as the executables.

Bug: 19617220
Change-Id: I5c4158698b6703843b67543d4396e2bffc5fb313
2015-03-13 16:30:21 -07:00
Xavier Ducrohet
8641d4dada Move mulit-dex files around.
This allows the mainDexClasses to work by
finding shrinkedAndroid.jar and proguard (from
the SDK Tools folder) correctly.

Change-Id: Ib3d85f775876b8a487af04bd072f6d8877f31d3b
2014-10-31 13:47:47 -07:00
Xavier Ducrohet
8361bb0dfa Update build-tools and support for multidex.
Add the script to run multi-dex manually in build tools
Update non-maven support package to .0.1 to release a version
with the fixed multi-dex support lib.

Change-Id: I78c84e0d999855f9fc20fadfa21647e570a9f8c9
2014-10-29 11:07:40 -07:00
Xavier Ducrohet
25feba6980 Package libc++.so in the build-tools.
This is needed by llvm-rs-cc.

Bug: 17584627
Change-Id: Id0ee90ccead26d3078f3f25022391d6866152203
2014-10-01 22:12:58 -07:00
Xavier Ducrohet
8791785cd0 Package Renderscript files for support mode.
Change-Id: I4eae052b01ae014f3e4d289ba33893dfd9c43309
2013-08-13 15:57:08 -07:00
Xavier Ducrohet
cefd49aae6 Strip dynamic libraries to reduce size.
Change-Id: Ic43c7cc3dfca82e359abf8ef4c3259ac06eaa7dc
2013-07-25 14:48:26 -07:00
Xavier Ducrohet
afda1d33de Add dynamic libraries for renderscript.
The new llvm-rs-cc compiler is not statically linked
anymore so those libraries are needed.

Also add the new support stuff.

Change-Id: I4d56f0b07f0f0f120b512726689ae4ff07f38322
2013-07-25 12:24:21 -07:00
Xavier Ducrohet
40525ef472 Move stuff from prebuilt to prebuilts/tools
Also move some atree copy to sdk.git where they belong.

Change-Id: Iab62343806917f24f47d15b9dea75e44422d8764
2012-04-03 16:33:35 -07:00
Raphael
f31a96aa9f SDK packaging for unified llvm-rs-cc binary.
Change-Id: I73971ade5bddadd2f395d098e5a083a6f683c302
2011-09-08 16:42:12 -07:00
Xavier Ducrohet
79aa3cea3a Prepare new plat-tools SDK component with 2 llvm versions.
The output of the platform tree build is llvm-rs-cc-2 and should
be used for apps targeting 12+. This is encoded in llvm-rs-cc.txt

The older (HC) version of llvm-rs-cc is copied from the prebuilt
and is used for apps targeting 11+.

Until new tools that can read/process llvm-rs-cc.txt are released,
old tools will use the HC version of llvm-rs-cc which ensure
proper compatibility.

Change-Id: Iddb924409cc9238531bf1a0448b14b7eac3396a5
2011-06-22 15:27:44 -07:00
Xavier Ducrohet
76033864c5 Add GestureBuilder to the samples. 2009-07-22 15:47:57 -07:00
Raphael Moll
53f1c71a03 Revert "Package both swt.jar for linux-x86 and linux-x86_64."
This reverts commit 8f346c14d0.
https://android-git.corp.google.com/g/Gerrit#change,5179
2009-06-25 14:09:07 -07:00
Raphael Moll
8f346c14d0 Package both swt.jar for linux-x86 and linux-x86_64.
This depends on another CL in prebuilt that packages
both linux-x86/swt/swt.jar and linux-x86/swt_64/swt_64.jar:

  https://android-git.corp.google.com/g/5178

The new jar are picked from out/... rather than prebuilt,
which seems to work better.
2009-06-23 20:04:00 -07:00
Xavier Ducrohet
c5a89e256c Change the SDK, DDMS and Traceview to work with the new SWT libraries.
The SDK now contains 32 and 64 bit version of SWT. DDMS and Traceview
use the archquery java app to check the architecture of the VM to decide
which version of SWT should be used to run the apps.
2009-06-04 14:50:43 -07:00
The Android Open Source Project
52d4c30ca5 auto import from //depot/cupcake/@135843 2009-03-03 19:29:09 -08:00
The Android Open Source Project
d4aee0c0ca auto import from //depot/cupcake/@135843 2009-03-03 18:28:16 -08:00
The Android Open Source Project
5c11852110 Initial Contribution 2008-10-21 07:00:00 -07:00