Commit Graph

5304 Commits

Author SHA1 Message Date
Colin Cross e8a5405f7f Merge changes If6d512ff,I3171f921 am: 49a7feb189
am: 8598fa6671

Change-Id: Ic1bfeec522112acd7f63a17ab23e8f8c0ba2616e
2017-10-25 17:41:26 +00:00
Colin Cross 8598fa6671 Merge changes If6d512ff,I3171f921
am: 49a7feb189

Change-Id: I7bee7d40f1d49dfc196ea99407b169429ac7ffc7
2017-10-25 17:38:29 +00:00
Colin Cross 49a7feb189 Merge changes If6d512ff,I3171f921
* changes:
  Add convenience phony targets for system modules
  Don't panic in turbine with no classes
2017-10-25 17:28:25 +00:00
Jiyong Park 4d7d02483e LLNDK can re-export headers am: 2a45412445
am: 939658c4a8

Change-Id: I70104b585d5a7e8ab4ac0e58953896509e813ade
2017-10-25 03:11:38 +00:00
Jiyong Park 939658c4a8 LLNDK can re-export headers
am: 2a45412445

Change-Id: I15dbe8697786ce257f6ff177ea6d4aa2ca2c262c
2017-10-25 03:07:04 +00:00
Jiyong Park 2a45412445 LLNDK can re-export headers
Added export_llndk_headers properties to llndk_library module. And a new
module type llndk_headers is added. This is to enable an LLNDK library
to reexport other LLNDK headers.

Bug: 65395259
Test: do the following
// frameworks/native/libs/arect/Android.bp
llndk_headers {
    name: "libarect_vendor_headers",
    export_include_dirs: ["include"],
}

// frameworks/native/libs/nativewindow/Android.bp
llndk_library {
    name: "libnativewindow",
    ....
    export_llndk_headers: ["libarect_vendor_headers"],
}

check that
-Iframeworks/native/libs/arect/include is in LOCAL_EXPORT_CFLAGS of
libnativewindow.vendor in out/soong/Android-<product>.mk

Change-Id: If1650414b2967f2042f4ebe2b593ed3f3ea45d3a
2017-10-25 10:30:05 +09:00
Colin Cross 88c37d3c5f Add convenience phony targets for system modules
OpenJDK9 system modules are not build modules, which means they
can't be built with m core-system-modules.  Add a phony target.

Test: m core-system-modules
Change-Id: If6d512ff7a009b49743fb25cbb566935ec1c0153
2017-10-24 16:02:53 -07:00
Colin Cross 5c6ecc179f Don't panic in turbine with no classes
ALLOW_MISSING_DEPENDENCIES=true can cause missing dependencies to be
hidden from GenerateAndroidBuildActions, which is triggering the
len(jars) == 0 check in compileJavaHeader.  For the
ALLOW_MISSING_DEPENDENCIES=true case the check is unnecessary, as the
build rules will be replaced with runtime errors.  On the off chance
the check would have been hit in a real build, allow merge_zips to
create an empty zip file if it is asked to.

Test: m ALLOW_MISSING_DEPENDENCIES=true
Change-Id: I3171f921d51229ddf38a1a647d32566658c673fa
2017-10-24 16:01:44 -07:00
Colin Cross cee7bf36c3 Merge changes Id806633d,I05e945f3,Ieac84040,I18eb8cc0,If11c298e am: 17ae970a92
am: 70898c5f45

Change-Id: Iabd137dc87d3123530239cda8e7aba191b2a873a
2017-10-24 21:34:14 +00:00
Colin Cross 70898c5f45 Merge changes Id806633d,I05e945f3,Ieac84040,I18eb8cc0,If11c298e
am: 17ae970a92

Change-Id: I41deccdfac6f35a477e044de1244424540b42da9
2017-10-24 21:30:59 +00:00
Treehugger Robot 17ae970a92 Merge changes Id806633d,I05e945f3,Ieac84040,I18eb8cc0,If11c298e
* changes:
  Fix missing source module with ALLOW_MISSING_DEPENDENCIES=true
  Convert Visit*Deps from blueprint.Module to android.Module
  Move first/last unique elements utility functions to android package
  Move ModuleContext.ModuleBuild to ModuleContext.Build
  Make android.ModuleContext not include blueprint.ModuleContext
2017-10-24 21:16:43 +00:00
Colin Cross a2c4544626 Merge "Use prebuilt dx for PDK builds" am: 3615dcb30c
am: 9e4d063484

Change-Id: Iad94208b848514c1aad0665b8965ad115c742786
2017-10-24 20:25:17 +00:00
Colin Cross 9e4d063484 Merge "Use prebuilt dx for PDK builds"
am: 3615dcb30c

Change-Id: I5b55ad84cdac0e28331e1ca3919c56a675d0090c
2017-10-24 20:21:38 +00:00
Colin Cross 0617bb85c6 Fix missing source module with ALLOW_MISSING_DEPENDENCIES=true
A module referenced with srcs: ":module" was not honoring
ALLOW_MISSING_DEPENDENCIES=true.  Don't fail if the module
doesn't exist, an error will already have been produced by
ExtractSourcesDeps.

Bug: 68183622
Test: m ALLOW_MISSING_DEPENDENCIES=true
Change-Id: Id806633d12ab2ecd78b532e1922e59824e5c20a8
2017-10-24 13:05:06 -07:00
Colin Cross d11fcda940 Convert Visit*Deps from blueprint.Module to android.Module
Also adds checks that the dependencies are android.Modules and
are not disabled.

Test: m checkbuild
Change-Id: I05e945f38915d49cd3c0ab72a86576949bc7eff2
2017-10-24 13:01:03 -07:00
Treehugger Robot 3615dcb30c Merge "Use prebuilt dx for PDK builds" 2017-10-24 19:17:49 +00:00
Colin Cross b671544973 Move first/last unique elements utility functions to android package
Move firstUniqueElements to android.FirstUniqueStrings,
lastUniqueElements to android.LastUniqueStrings, and lastUniquePaths
to android.LastUniquePaths.

Test: m checkbuild
Change-Id: Ieac840405126c7f8f98afb4a4ef35c01a18fe7fb
2017-10-24 12:12:32 -07:00
Colin Cross ae88703df5 Move ModuleContext.ModuleBuild to ModuleContext.Build
Now that android.ModuleContext does not include blueprint.ModuleContext
we can rename android.ModuleContext.ModuleBuild to
android.ModuleContext.Build without colliding with
blueprint.ModuleContext.Build.  Leave ModuleBuild as a wrapper around
Build for now to avoid having to update all the users outside
build/soong simultaneously.

Test: m checkbuild
Change-Id: I18eb8cc04faf002049a11d9aac97e9732ff5d638
2017-10-24 10:59:00 -07:00
Colin Cross 3f68a1362b Make android.ModuleContext not include blueprint.ModuleContext
android.ModuleContext should replace the blueprint.ModuleContext
methods with ones that take android.Module parameters instead of
blueprint.Module parameters.  As a first step, don't include
blueprint.ModuleContext in android.ModuleContext and manually
specify the methods from blueprint.ModuleContext that we need.
Future patches will replace these methods with ones that take
android.* types.  Also do the same for TopDownMutatorContext.

Test: m checkbuild
Change-Id: If11c298eed98bc65712b4942d0283cafa058726c
2017-10-24 10:58:59 -07:00
Colin Cross 0d3f8c0db6 Use prebuilt dx for PDK builds
The source for dx may not be available in PDK builds, use the
prebuilt one from prebuilts/build-tools instead.

Bug: 67663308
Test: m TARGET_BUILD_PDK=true
Change-Id: I9090b5190539f901fc05264a472133c12d4ea2a1
2017-10-24 10:52:26 -07:00
Colin Cross 9cc678af6c Fail when a module depends on a disabled module am: 1e45cb77a0
am: d602bc1cda

Change-Id: I41997bd931b7e0ed3715da8523ecda3d4f48ab42
2017-10-24 01:31:30 +00:00
Colin Cross d602bc1cda Fail when a module depends on a disabled module
am: 1e45cb77a0

Change-Id: I454b353606584838764ebc4d83d6568286b65bcc
2017-10-24 01:28:59 +00:00
Colin Cross 1e45cb77a0 Fail when a module depends on a disabled module
Copy the logic from cc.go to fail when a module depends on a disabled
module.  A future change will refactor this to remove the duplication
and cover all other module types.

Test: m TARGET_BUILD_PDK=true doesn't panic
Bug: 67663308
Change-Id: Iab2b142cebdbd74df934e4733f0de83bd3334d86
2017-10-23 16:43:47 -07:00
Colin Cross ec3c837df3 Merge changes from topic "soong_prebuilts_misc_common" am: 254aaec328
am: 0c503f1e80

Change-Id: I8702693e695ee9af1e1df21b255e3e8d61e1aad3
2017-10-23 21:19:10 +00:00
Colin Cross 5bfb60fe23 Support multiple outputs in genrules with depfile: true am: 15e86d938b
am: d85ff2fa7a

Change-Id: I88a78e6028af25cefe0d7482eacce2c845e84da8
2017-10-23 21:19:02 +00:00
Colin Cross 338e815cd2 Support installable prebuilt jars am: 535e2cf4e1
am: 56ee7b6c44

Change-Id: Ifc6378346d0ce274697b0c57fb3d2bd3509bb0b3
2017-10-23 21:18:57 +00:00
Colin Cross 0c503f1e80 Merge changes from topic "soong_prebuilts_misc_common"
am: 254aaec328

Change-Id: I68c26fd073e1621a428e09c108dce5bd0a5f08ec
2017-10-23 21:16:59 +00:00
Colin Cross d85ff2fa7a Support multiple outputs in genrules with depfile: true
am: 15e86d938b

Change-Id: If3c3ed7927ca8343077b9e053359a8f122cf7b86
2017-10-23 21:16:46 +00:00
Colin Cross 56ee7b6c44 Support installable prebuilt jars
am: 535e2cf4e1

Change-Id: Ibfe43dd69f27abc6a7a945f822f5f39a4638bf10
2017-10-23 21:16:33 +00:00
Treehugger Robot 254aaec328 Merge changes from topic "soong_prebuilts_misc_common"
* changes:
  Fix finding src directory for aidl
  Support multiple outputs in genrules with depfile: true
  Support installable prebuilt jars
2017-10-23 21:12:13 +00:00
Jiyong Park a771b248dd Merge "Allow macro definition with space" am: d8cc795f86 am: f14986b8a6
am: 7fdca00c33

Change-Id: If7bccc3001e349002217915ca44080198571747f
2017-10-22 07:47:02 +00:00
Jiyong Park 7fdca00c33 Merge "Allow macro definition with space" am: d8cc795f86
am: f14986b8a6

Change-Id: Id204c6efa719e5f03d75541e6f34ce7618462c28
2017-10-22 07:44:00 +00:00
Jiyong Park f14986b8a6 Merge "Allow macro definition with space"
am: d8cc795f86

Change-Id: I7b95bcee363fcacccb090bb57e529709c8b7934f
2017-10-22 07:41:29 +00:00
Treehugger Robot d8cc795f86 Merge "Allow macro definition with space" 2017-10-22 07:38:51 +00:00
Colin Cross e243c231da Fix finding src directory for aidl
aidlFlags was always looking for a src directory at the top level
instead of in the module's source directory.

Test: m checkbuild
Change-Id: Ie31baa21c8632c2bd9a6ebc42e6291417b1f31cd
2017-10-21 15:19:43 -07:00
Colin Cross 9dd0f4dc0b Add $ORIGIN to rpath for host tests am: bd75e1d0bd am: 24d1ed50ac
am: 0c10682d7e

Change-Id: I46ca038e38714057e01624548ede673db3d9cabf
2017-10-21 17:56:12 +00:00
Colin Cross 0c10682d7e Add $ORIGIN to rpath for host tests am: bd75e1d0bd
am: 24d1ed50ac

Change-Id: I11427656f0145143f8c306caff1b8e13da24b4f5
2017-10-21 17:53:38 +00:00
Colin Cross 24d1ed50ac Add $ORIGIN to rpath for host tests
am: bd75e1d0bd

Change-Id: I017e2a833c830eb3c57831fc4bf45a7aca09f88c
2017-10-21 17:51:06 +00:00
Colin Cross bd75e1d0bd Add $ORIGIN to rpath for host tests
Allow loading test libraries installed into the test directory.

Test: builds
Change-Id: I15a462ebd41b99e9eb76b5be889ed3bd013732e0
2017-10-21 16:04:14 +00:00
Colin Cross 15e86d938b Support multiple outputs in genrules with depfile: true
Ninja doesn't support depfiles on a rule with multiple outputs.
Use a single output and put all the rest as implicit outputs.

Bug: 68057449
Test: java_test.go
Change-Id: Ia544493b1b3b51b185c865149d8f3e0eb3c57ee2
2017-10-20 20:44:50 -07:00
Colin Cross 8d407c734b Use prebuilts/sdk/*current until Soong can generate stubs am: 2ebc476646 am: 730bb0113c
am: 07d4fb0ce4

Change-Id: Iefcb2bc594e6201b427a401f779d590a41b38902
2017-10-21 03:42:24 +00:00
Colin Cross ec498c0394 Add sdk_version property to imported jars am: 461bd1aae7 am: 6c1b2c14f8
am: 2b0548c88e

Change-Id: Ib75fa5972cb278e591a3d115f347904b01df4721
2017-10-21 03:42:17 +00:00
Colin Cross 07d4fb0ce4 Use prebuilts/sdk/*current until Soong can generate stubs am: 2ebc476646
am: 730bb0113c

Change-Id: I2314281f389321867971262a4b87e081b4615ce4
2017-10-21 03:39:53 +00:00
Colin Cross 2b0548c88e Add sdk_version property to imported jars am: 461bd1aae7
am: 6c1b2c14f8

Change-Id: Ie579acea36266f9ef7a845b53973c0d133a26cec
2017-10-21 03:39:46 +00:00
Colin Cross 730bb0113c Use prebuilts/sdk/*current until Soong can generate stubs
am: 2ebc476646

Change-Id: Ia32894aa7ac8a62ccef2aa0b5017114d403de622
2017-10-21 03:37:46 +00:00
Colin Cross 6c1b2c14f8 Add sdk_version property to imported jars
am: 461bd1aae7

Change-Id: I2782bf3ba9d412499124c371fb16e68fce212dbe
2017-10-21 03:37:43 +00:00
Colin Cross 535e2cf4e1 Support installable prebuilt jars
Some host modules need to be installed.  Add an installable property.

Test: m checkbuild
Change-Id: Ifd023213ff66e81aa77ba1741c75837a1dd88d1d
2017-10-20 20:14:47 -07:00
Colin Cross 2ebc476646 Use prebuilts/sdk/*current until Soong can generate stubs
The android_*stubs_current modules don't yet exist, so fall back to
the prebuilt jars for now.

Test: m checkbuild
Change-Id: Iabd32b30954b3f4a6d9a779fde52a032b684807e
2017-10-20 20:14:22 -07:00
Colin Cross 461bd1aae7 Add sdk_version property to imported jars
Test: m checkbuild
Change-Id: I83dd6ad157c7a5918747ce8c9be05c1e1e22d710
2017-10-20 20:14:22 -07:00
Nan Zhang 1ba9ca7b90 Support Turbine in Soong. am: ed19fc3e2c am: 5aae858f1a
am: 9324fdd0a7

Change-Id: I3edfd497798be5f6ba4a53b1d0e6b1ef121a84e2
2017-10-21 01:38:19 +00:00