Commit Graph

23156 Commits

Author SHA1 Message Date
Dan Willemsen
e1cbfc717b java_source_list_file is only created when full_classses_jar is set
So avoid creating an unused phony target when we aren't compiling
anything.

Test: treehugger
Change-Id: I4e6d9d93ee5a7d11db6b4a6c7da1ba947d96e575
2020-04-28 15:55:49 -07:00
Dan Willemsen
17315c2eda Remove empty rules for check_elf_files.timestamp
If we don't have any new dependencies, or we never set up the
check_elf_files.timestamp rule, don't create an empty one now.

There were >7000 of these unused and empty rules in my AOSP
aosp_cf_x86_phone build.

This was initially brought to my attention by the new checks in
https://github.com/google/kati/pull/189

Test: diff out/build-aosp_cf_x86_phone.ninja, only removed phony rules
Change-Id: Ia43cbbd04df4a01d2182b14e3ccbe5d5ecbcabad
2020-04-28 14:56:06 -07:00
Treehugger Robot
02031027b7 Merge "Exempt RRO from the restriction on API level" 2020-04-27 22:42:01 +00:00
Bill Peckham
0d5a6748a8 Merge "Allow recording ALL_DEPS by setting RECORD_ALL_DEPS" 2020-04-27 20:59:48 +00:00
Dan Shi
6c04458129 Merge "[VTS] copy ltp and kselftest to testcase folder" 2020-04-27 18:28:17 +00:00
Bill Peckham
a2c63454a6 Allow recording ALL_DEPS by setting RECORD_ALL_DEPS
This change enables recording ALL_DEPS information
without having to specify the deps-license goal, which
can be useful to populate the dependencies field of
module-info.json for various types of post-processing.

Usage: `RECORD_ALL_DEPS=true make droid` (preferred), or
`make RECORD_ALL_DEPS=true droid`.

Test: make, inspect module-info.json
Test: RECORD_ALL_DEPS=true make, inspect module-info.json
Bug: 151755703
Change-Id: Ib81a8dfb0ecbe0b63be320a9d33e558b419cb4b2
2020-04-27 18:28:10 +00:00
Jeongik Cha
07a44f48dc Exempt RRO from the restriction on API level
As auto generated RRO, an arbitrary RRO needs to be exempted as well.
It is okay because RRO packages can access only resource defined in
public.xml, when RRO packages want to refer other package's resource.

Bug: 152926556
Test: build RRO packages
Test: check if product/vendor app still can't use hidden APIs
Change-Id: I8dc2922af5eb5c87ccd97d1b8d080b3ed48cf9a6
2020-04-27 22:36:21 +09:00
Jeongik Cha
82fead38a4 Restore $(SOONG_OUT_DIR)/ndk/% in static_whitelist_patterns
$(SOONG_OUT_DIR)/ndk/% needs to be whistlisted in release branch
(ag/11251273)
Accordingly, restore it in aosp as well.

Bug: 148993225
Test: m nothing
Change-Id: I7503c007c3e786b0cab26ea1422f0d4ba5a40662
2020-04-27 04:44:58 +00:00
Jiyong Park
f9e67a8980 mark platform un-availability
A module is marked unavailable for platform when 1) it does not have
"//apex_available:platform" in its apex_available property, or 2)
it depends on another module that is unavailable for platform.

In that case, LOCAL_NOT_AVAILABLE_FOR_PLATFORM is set to true for the
module in the Make world. Later, that flag is used to ensure that there
is no module with the flag is installed to the device.

The reason why this isn't entirely done in Soong is because Soong
doesn't know if a module will be installed to the device or not. To
explain this, let's have an example.

cc_test { name: "mytest", static_libs: ["libfoo"]}
cc_library_static { name: "libfoo", static_libs: ["libbar"]}
cc_library { name: "libbar", apex_available: ["com.android.xxx"]}

Here, libbar is not available for platform, but is used by libfoo which
is available for platform (apex_available defaults to
"//apex_available:platform"). libfoo is again depended on by mytest
which again is available for platform. The use of libbar should be
allowed in the context of test; we don't want to make libbar available
to platform just for the dependency from test because it will allow
non-test uses of the library as well.

Soong by itself can't tell whether libfoo and libbar are used only in the
context of a test. There could be another module depending them, e.g.,

cc_library_shared { name: "mylib", static_libs: ["libfoo"] }

can exist and it might be installed to the device, in which case
we really should trigger an error.

Since Make has the knowledge of what's installed and what's not,
the check should be done there.

Bug: 153073816
Test: m

Change-Id: I14ddf0e5700d0a7bf60e4e41536efbd26ab5ed3d
2020-04-27 08:46:41 +09:00
Dan Shi
7d1f8cec25 [VTS] copy ltp and kselftest to testcase folder
Bug: 154446791
Test: m -j vts_kernel_tests vts
Change-Id: I405c227293085d3fd0603e9eba5ce276d7dc14d5
2020-04-24 14:49:25 -07:00
Ivan Lozano
fcd8fcefa8 Add support for Rust coverage files from Soong.
Bug: 146448203
Test: Coverage file zips are installed correctly by make.
Change-Id: Ia087ec87e5c7be0a91a43307abeabafaa9b366f3
2020-04-24 16:29:17 -04:00
Ulyana Trafimovich
7146d5f41e Merge "Add PRODUCT_SYSTEM_SERVER_JARS_EXTRA interface" 2020-04-24 15:23:32 +00:00
Treehugger Robot
691d385147 Merge "Clean up static_whitelist_patterns" 2020-04-24 12:03:21 +00:00
Treehugger Robot
4aa437f3ab Merge "Extend static_whitelist_patterns" 2020-04-24 08:02:33 +00:00
Jeongik Cha
ab50b8fa85 Extend static_whitelist_patterns
product-installed-files generates more default artifacts than
$(call module-installed-files,$(call auto-included-modules)),
and it causes problems when we try to apply this mechanism to other
partition

So use product-installed-files with an empty parameter as static
whitelist

Test: apply require-artifacts-in-path to other partition(or path),
      and then, m nothing
Test: add system module outside mainline_system.mk, and check if there is error.

Bug: 148993225
Change-Id: Ie110f20ff833229b23a777ff1decb32f84b9cef7
2020-04-24 05:08:02 +00:00
Jeongik Cha
4472819166 Clean up static_whitelist_patterns
$(HOST_OUT)/% and $(SOONG_OUT_DIR)/ndk/% are not necessary anymore.

Bug: b/148993225
Test: m nothing
Change-Id: If2551283ebb6c516c029d1c04aebe25661bc6a1a
2020-04-24 14:05:49 +09:00
Rock.Yeh
2a703ce2f6 Add PRODUCT_SYSTEM_SERVER_JARS_EXTRA interface
This interface allows vendor to append their system server jars after AOSP's
without changing inherit order.

Test: booting
Test: build pass on branch r-fs-release with this patch

Change-Id: I0ddf35bdf725c262f817985f5494b5968db21fcd
2020-04-23 10:29:40 +08:00
Treehugger Robot
be01cf841e Merge changes I465ea6c9,I57b77d7c
* changes:
  generate multiple boot.img files in aosp_arm64
  create emulator_arm64 device for sdk_phone_arm64 to use
2020-04-22 03:45:49 +00:00
android-build-team Robot
6c86a509d1 Version bump to QQ3A.200605.002 [core/build_id.mk]
Change-Id: Id42329c0e71a750d7634ac6860c696bb26bacb5b
2020-04-22 00:53:25 +00:00
Dan Willemsen
85dbb754e2 Merge changes from topic "mk-rm-obsolete"
* changes:
  Obsolete unused module types
  Remove AUX support
2020-04-21 22:35:36 +00:00
Treehugger Robot
dd9690162f Merge "support multiple boot.img files in release tools" 2020-04-20 08:13:36 +00:00
Steve Muckle
0959fbfd2e generate multiple boot.img files in aosp_arm64
Generate boot.img variants with different schemes for kernel compression
(gzip, lz4, none).

The boot image is removed from vbmeta for aosp_arm64 since it is
not possible currently to store the hashes of multiple variants of a
particular image. The GKI will be verified via VTS anyway.

Also remove some emulator-specific stuff from aosp_arm64.

Bug: 151094943
Change-Id: I465ea6c98d52e839284d51b246203f6b8dfb5566
2020-04-20 05:31:15 +00:00
Dan Willemsen
efee0692d4 Obsolete unused module types
These were deprecated in R, which has now branched, and there aren't any
users on master.

Test: build-aosp_crosshatch.ninja is identical
Test: treehugger
Change-Id: I6286880e45c0facbae56f9a16e8cfcbde12f121c
2020-04-18 21:00:18 -07:00
Dan Willemsen
58634e1482 Remove AUX support
This was deprecated in R, which has now branched, and there aren't any
users on master.

Test: build-aosp_crosshatch.ninja is the same (except for the removal of the empty auxiliary target)
Test: treehugger
Change-Id: I306156ab7f91cd4a2258554b4215766c99cd12d1
2020-04-18 21:00:18 -07:00
Jingwen Chen
e8befad090 Use prebuilt dir variable for BISON_PKGDATADIR, instead of an absolute path.
Test: m

Signed-off-by: Jingwen Chen <jingwen@google.com>
Change-Id: I329d8f685f60fd05727b65aecb82eb03807e9201
2020-04-18 14:38:25 +00:00
Anton Hansson
c94417e9a7 Merge "Remove _API_FILE variables" 2020-04-18 09:13:49 +00:00
Kousik Kumar
1d56417af0 Merge "Use soong_zip instead of jar to generate .jar files in javac actions" 2020-04-17 21:51:31 +00:00
Anton Hansson
ac1887227d Remove _API_FILE variables
There are no known usages of these variables, and they've been
incorrectly set for a long time.

The phony for $(LOCAL_MODULE) in droiddoc to build the api txt
has been moved to soong.

Bug: 152479829
Test: m
Change-Id: I31742e50d1af42fb899c7a3436af5647bd90cc47
2020-04-17 20:27:41 +01:00
Kousik Kumar
7d61116cc1 Use soong_zip instead of jar to generate .jar files in javac actions
This is to make the jar-output deterministic so that we can get
cache-hits for r8/d8 actions from RBE.

Change-Id: I911ee702fa5dabfe7122e82b21f78c811a0c960d
Test: m droid checkbuild
2020-04-16 18:23:32 -07:00
Yo Chiang
2cbcf3bda2 Merge "Check ELF prebuilts in PRODUCT_COPY_FILES" 2020-04-17 01:06:32 +00:00
Steve Muckle
9793cf6c8a support multiple boot.img files in release tools
Support for generating multiple boot.img files is required in the
release tools to enable GKI distribution/signing.

Bug: 151094943
Change-Id: I536a286d3123f35918106a52c49b1148d746370f
2020-04-16 17:54:25 -07:00
Treehugger Robot
cffe5615f6 Merge "multi boot.img support cleanups" 2020-04-16 23:22:52 +00:00
Dan Shi
c581e59998 Remove phony target vts-core
The target has been removed from all builders.

Bug: 151896491
Test: none
Change-Id: I5d1b1058b18153c9cedb33b151dec8daab3e2e57
2020-04-16 11:45:56 -07:00
Steve Muckle
10346271fd multi boot.img support cleanups
The kernel should not be specified in INTERNAL_RECOVERYIMAGE_ARGS, since
it is already given to mkbootimg directly.

The MKBOOTIMG_KERNEL_ARG macro is unused.

Bug: 151094943
Change-Id: Ie16a7bf7d77c0436d933abbb02c6dcb9202d5fe7
2020-04-15 14:32:39 -07:00
Dan Shi
3c4326f32f Merge "Include shared host liraries in test suite zip" 2020-04-14 23:10:51 +00:00
Treehugger Robot
44bb05c328 Merge "Enable non-v3 recovery image with v3 boot image" 2020-04-14 22:37:28 +00:00
Steve Muckle
f84668e1da Enable non-v3 recovery image with v3 boot image
Add support for building a non-v3 recovery image along with a
v3 boot.img and vendor_boot image.

Bug: 150825361
Change-Id: I80d4e71ff09b83dd1c7f9accb4de99a30f95f4bf
2020-04-14 13:03:58 -07:00
Jooyung Han
10644f1485 Merge "Remove PLATFORM_VERSION_FUTURE_CODENAMES" 2020-04-14 04:00:03 +00:00
Jooyung Han
7fcd3b36ee Remove PLATFORM_VERSION_FUTURE_CODENAMES
It has been wrong to split ALL_VERSIONS into exclusive two sets of
before/after TARGET_PLATFORM_VERSION.

And PLATFORM_VERSION_ALL_CODENAMES supports all *active* list of
non-finalized codenames.

Bug: 152960049
Test: m
Merged-In: I1e87206a7f261e587cf079cb6b7025ca16aa4fe4
Change-Id: I1e87206a7f261e587cf079cb6b7025ca16aa4fe4
(cherry picked from commit abe575d17b)

Exempt-From-Owner-Approval: cp from master
Change-Id: I1e87206a7f261e587cf079cb6b7025ca16aa4fe4
2020-04-14 02:06:19 +00:00
android-build-team Robot
44a75a0268 Make change and version bump to QQ3A.200605.001
Change-Id: I416b816e48194b4626e67a94d5ff3cca6cd8d745
2020-04-14 01:05:41 +00:00
Paul Scovanner
609eb2ae7b Update Security String to 2020-06-05
Bug: 153882927

Change-Id: I115a68d442f4f3922f0353fae1aae3bf1c057903
(cherry picked from commit a52a320ffd)
2020-04-14 01:03:02 +00:00
Treehugger Robot
8266acdb9d Merge "Don't install test suite files from uninstallable modules" 2020-04-14 00:26:00 +00:00
android-build-team Robot
23b0469be0 Make change and version bump to QQ3A.200601.001
Change-Id: Ic22d3dd84073d826689035f65d8614c6ddbbf880
2020-04-13 23:18:48 +00:00
Paul Scovanner
ae9b194cee Update Security String to 2020-06-01
Bug: 153882927

Change-Id: Ibae64bd6c82ddb1afc801550fd7c4ac7bceeb4cc
(cherry picked from commit 388e683934)
2020-04-13 23:18:18 +00:00
Colin Cross
fca369e4e3 Don't install test suite files from uninstallable modules
Don't copy tests or test data to the test suite directories if the
module is marked LOCAL_UNINSTALLABLE_MODULE := true.

Fixes: 153758132
Test: m checkbuild
Change-Id: Ibdf18807a2ffe9bb352d74880a802ad55b57f154
2020-04-13 12:21:44 -07:00
Dan Shi
6a619b8d85 Include shared host liraries in test suite zip
Bug: 151194160
Test: m -j vts && \
  ls out/host/linux-x86/vts/android-vts/testcases/lib64/
Change-Id: I7ebc4bf392d4c0f27478607846974631390097f8
2020-04-13 09:29:16 -07:00
Dan Willemsen
4fb98e9d58 Master is now S
Bug: 150754986
Test: treehugger
Change-Id: Icf910c950b5bee32fc04db3b1e61251a5706c109
Merged-In: Icf910c950b5bee32fc04db3b1e61251a5706c109
2020-04-10 05:19:35 +00:00
android-build-team Robot
7d3524fbbb Version bump to QQ3A.200410.002 [core/build_id.mk]
Change-Id: I366757506c7187a8339debeb7aa100c5a0083e06
2020-04-10 02:37:13 +00:00
android-build-team Robot
9039599004 Make change and version bump to QQ3A.200410.001
Change-Id: Id2a958544fb96f2321fc61e9067ae28a8d541e3f
2020-04-09 23:29:29 +00:00
Paul Duffin
388f1a4596 Merge "Add phony module for droidstubs even if srcjar is not created" 2020-04-09 15:42:07 +00:00