Commit Graph

50420 Commits

Author SHA1 Message Date
Patrice Arruda c4dae4d7ab Revert "Deprecate bash m* commands and use the soong's modules-in* build commands instead."
This reverts commit 610b6302cf.

Reason for revert: m mlibc from root dir works. Create a tmp dir and then cd in to tmp. Run the same command and it fails.

Change-Id: I0f0c056d7e668da621ae99d347a055ecdf2dec07
2019-06-20 22:32:46 +00:00
Patrice Arruda 610b6302cf Deprecate bash m* commands and use the soong's modules-in* build commands instead.
The functionality of m* envsetup.sh commands has been implemented in
soong_ui. The bash functionality of m* commands can be replaced by
soong's modules-in* build commands.

Fixes: b/130049705
Test: * Loaded the envsetup.sh on a new environment
      * Executed each m* command.
      * Verified with "type <build command>" to make sure
        the function generation is correct.
      * Ran on Darwin environment.

Change-Id: I8792e4f1f1727aba2ca6ee4bdfe657f6ac42302a
2019-06-19 14:16:38 -07:00
Treehugger Robot 1e5fcc0d79 Merge "Revert "Revert "Revert "Print full diagnostics file when Java process crashes."""" 2019-06-05 09:53:22 +00:00
Jimmy Chen 7a8690455f Revert "Revert "Revert "Print full diagnostics file when Java process crashes."""
This reverts commit 1e3ad0eb5d.

Reason for revert: break build

Change-Id: I43022f556d5b73956d44cdda43b0b2499225b123
2019-06-05 06:47:03 +00:00
Treehugger Robot ec2772d2be Merge "Changes.md: Change OUT_DIR to PRODUCT_OUT" 2019-06-04 22:06:49 +00:00
Tao Bao 23def8793d Merge "releasetools: Allow verifying chained vbmeta partitions." 2019-06-04 21:23:09 +00:00
Tao Bao 08c190fc89 releasetools: Allow verifying chained vbmeta partitions.
Chained vbmeta partitions (vbmeta_system, vbmeta_vendor) were added to
support dynamic partitions. validate_target_files.py misses the logic in
handling such partitions.

Bug: 132882632
Test: Run validate_target_files.py on a target_files.zip that uses
      chained vbmeta_system partition.
Change-Id: Id06c575d13d5e9cc1b621f485ceb75d3e354c39f
Merged-In: Id06c575d13d5e9cc1b621f485ceb75d3e354c39f
(cherry picked from commit 814b14b3f7)
2019-06-04 12:49:41 -07:00
Treehugger Robot a9266be96f Merge "Revert "Revert "Print full diagnostics file when Java process crashes.""" 2019-06-04 17:16:10 +00:00
Yasuhiro Kubota cd301f6722 Changes.md: Change OUT_DIR to PRODUCT_OUT
"OUT" means "out/target/proudct/<product>/".
But "OUT_DIR" means "out/".
So we can't use "OUT_DIR" instead of "OUT".

We can use "PRODUCT_OUT" instead of "OUT" which means same folder.

Test: N/A Just document modification
Change-Id: Id08664ba48b226ead7ab6b00d0291259d3a737ba
2019-06-04 20:49:51 +09:00
Tri Vo f4a8b6415f Merge "Reland "Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS"" 2019-06-03 20:14:01 +00:00
Anton Hansson 9c560f17a8 Merge "core/main: Strip bitness before existence check" 2019-06-03 18:47:30 +00:00
Alexander Smundak 1e3ad0eb5d Revert "Revert "Print full diagnostics file when Java process crashes.""
This reverts commit 6c77a6baa6.

Reason for revert: aog/974065 fixes the problem that caused the revert

Change-Id: I935f78762b23ac63a79a9529515ff4ef394d5c3c
2019-06-03 16:55:13 +00:00
Treehugger Robot 206ef1f4fb Merge "Adds validation check that certain partitions come from a single build." 2019-06-03 14:24:14 +00:00
Felix b56b25157c core/main: Strip bitness before existence check
Strip bitness information for PRODUCT_PACKAGES and
PRODUCT_HOST_PACKAGES before checking against ALL_MODULES.

Also correct spelling: nonexistant -> nonexistent

Bug:
If PRODUCT_ENFORCE_PACKAGES_EXIST was set, the build system would
complain about nonexistent packages for e.g. HALs where the bitness was
specified using a suffix, such as android.hardware.audio@4.0-impl:32

Test:
Add android.hardware.audio@4.0-impl:32 to PRODUCT_PACKAGES, specify
PRODUCT_ENFORCE_PACKAGES_EXIST, ensure no whilelist is set.
"make systemimage vendorimage" -> No error.

Signed-off-by: Felix <google@ix5.org>
Change-Id: Id59460a19320aa9437b8805411a0d97fa6432633
2019-06-03 14:10:33 +02:00
Alexander Smundak 1270511080 Merge "Fix dump-vars output to handle quotes." 2019-06-02 22:40:23 +00:00
Tri Vo 790db2fc79 Reland "Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS"
Bug: 133196056
Test: m selinux_policy
Change-Id: I194167cc33ed9b0367dd3edfd5d954af5c1b4a13
2019-06-01 17:06:07 -07:00
Daniel Norman edf124780f Adds validation check that certain partitions come from a single build.
This is to prevent a user from accidentally including files from the
wrong build. For example, adding any SYSTEM/ line to other_item_list
while keeping SYSTEM/* in system_item_list would cause the other build
to introduce an extra or changed file in the system image.

Bug: 132730710
Test: python -m unittest test_merge_target_files
Change-Id: Ic1178cdc9b991114f293ff3f2b4e6054e06647c6
2019-06-01 04:39:46 +00:00
Treehugger Robot 3134681218 Merge "Revert "Print full diagnostics file when Java process crashes."" 2019-05-31 09:37:36 +00:00
Sasha Smundak 23a44f1b05 Fix dump-vars output to handle quotes.
Bug: 132766811
Test: treehugger
Change-Id: I4c054343cd11a089d93b7386b8d8ba04a7b6b77e
2019-05-30 20:59:50 -07:00
Alexander Smundak 6c77a6baa6 Revert "Print full diagnostics file when Java process crashes."
This reverts commit 09fd82ea89.

Reason for revert: This change set the value of JAVA make variable to a string containing "foo bar". When soong_ui is asked to evaluate such string, it drops the quotes, causing bash to treat 'foo' and 'bar' as separate command line arguments.

Change-Id: I81e07c4cd333751d185dc50c49d0638f6511727e
2019-05-31 03:15:09 +00:00
Treehugger Robot a628af2a42 Merge "AIDEGen: Add the java sources of host java library modules into module-info.json." 2019-05-31 01:04:05 +00:00
Treehugger Robot 81feca7af2 Merge "Print full diagnostics file when Java process crashes." 2019-05-30 21:16:51 +00:00
Treehugger Robot 8446ef89bd Merge "Remove obsolete Support Library guidance from version_defaults.mk" 2019-05-30 20:09:33 +00:00
Alan Viverette fef7f43401 Remove obsolete Support Library guidance from version_defaults.mk
Test: n/a docs only
Fixes: 133228727
Change-Id: Idbc56e1d53a5752ce07a47b41273b403187b24e9
2019-05-30 12:54:54 -04:00
Tao Bao f4d18a0d11 Merge "Obsolete PRODUCT_STATIC_BOOT_CONTROL_HAL." 2019-05-30 16:47:22 +00:00
Treehugger Robot 2d33715f1c Merge "fs_config: Fix cases without vendor/oem partition" 2019-05-30 16:41:34 +00:00
Treehugger Robot 523362d544 Merge "Ashmem VNDK library list update" 2019-05-30 07:36:41 +00:00
Sasha Smundak 09fd82ea89 Print full diagnostics file when Java process crashes.
Bug: 132766811
Test: treehugger
Change-Id: Id415c01559a941b793b03647354be136fa64d9a7
2019-05-29 17:46:57 -07:00
Felix 8453f02c65 fs_config: Fix cases without vendor/oem partition
If the device has neither an OEM nor a vendor partiton,
$PRIVATE_PARTITION_LIST will be empty, causing the fsconfig tool to fail
because the "--all-partitions" argument will be empty.

Quote the comma-substituted "$(PRIVATE_PARTITION_LIST)" - which may be
empty - to appease argparse, which will then populate "_all_partitions"
with an empty "str" object.

Checking _all_partitions against None is superfluous since either
argparse will catch the empty argument and fail early, or the argument
will be a string, in which case it will not be None.

Signed-off-by: Felix <google@ix5.org>
Change-Id: I236e30445b303b4945467b5dc4387d54b5d984f9
2019-05-29 22:24:05 +02:00
Jaewoong Jung cd56c0df95 Merge "Deprecate inherit-package." 2019-05-29 19:48:46 +00:00
Tao Bao 84f88a473a Obsolete PRODUCT_STATIC_BOOT_CONTROL_HAL.
Bug: 34254109
Test: TreeHugger
Test: Define PRODUCT_STATIC_BOOT_CONTROL_HAL and see the expected
      failure after lunch.
Change-Id: I914b84e874fe14a25dcfe56b282c56f88934d07c
2019-05-29 11:38:16 -07:00
Treehugger Robot 2459515d3a Merge "Move verify_uses_libraries.sh out of dexpreopt" 2019-05-29 18:09:01 +00:00
Kalesh Singh 8030ae0c9c Ashmem VNDK library list update
Added VNDK-core: android.system.ashmem@1.0.so

Bug: 133319042
Test: m -j
Change-Id: Idb0cbe2500376f641534781a9aa95c4b2a8533ee
2019-05-29 11:00:05 -07:00
Treehugger Robot c85f6d56f5 Merge changes Id8365ce4,I952515c2
* changes:
  Convert more uses of $(ACP) to `cp`
  Remove more tab characters from commands
2019-05-29 17:10:11 +00:00
Jaewoong Jung 1800c7abf5 Deprecate inherit-package.
Fixes: 122957760
Test: TreeHugger
Change-Id: I799f79092ff62808f59bba2bfcfe36d4417c034f
2019-05-29 09:17:09 -07:00
Treehugger Robot e246508e95 Merge changes from topic "rm_export"
* changes:
  Mark more BUILD_* as obsolete
  Obsolete BUILD_BROKEN_ANDROIDMK_EXPORTS
2019-05-29 01:17:01 +00:00
Tri Vo 10d4c5066c Merge "Revert "Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS"" 2019-05-29 01:12:15 +00:00
Tri Vo 02ae68ea63 Revert "Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS"
This reverts commit bdd494aaa6.

Reason for revert: breaks build

Change-Id: I971f0feee3b23754f3c0f9edec05fb3ddfb737c3
2019-05-29 01:00:56 +00:00
Tri Vo 355a45a8de Merge "Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" 2019-05-29 00:02:14 +00:00
Dan Willemsen 288bedfc8f Convert more uses of $(ACP) to `cp`
Test: treehugger
Change-Id: Id8365ce4c06dfe731be9b80f805e071fab522909
2019-05-28 15:36:47 -07:00
Dan Willemsen 18c1e61faf Remove more tab characters from commands
This makes my parsing of commands simpler when I only need to deal with
space characters instead of tabs (which aren't special in these
locations within makefiles).

Test: treehugger
Test: git show -w (only whitespace diffs)
Change-Id: I952515c26ca5265d71994fa3b1fa895c5346e92d
2019-05-28 15:12:34 -07:00
Dan Willemsen 0a92b4fbff Merge "soong_config: Include BOARD_VENDOR_SEPOLICY_DIRS" 2019-05-28 19:46:07 +00:00
Colin Cross f7d1a97c93 Merge changes I09bf331f,I5eeef3ed
* changes:
  Don't add dependency on missing optional shared libraries
  Add com.google.android.media.effects to missing uses-library list
2019-05-28 16:25:51 +00:00
Treehugger Robot 275919a79e Merge "Remove BUILD_BROKEN_ENG_DEBUG_TAGS" 2019-05-28 15:10:03 +00:00
Felix c3cdac6662 soong_config: Include BOARD_VENDOR_SEPOLICY_DIRS
BOARD_VENDOR_SEPOLICY_DIRS should be used in favour of
BOARD_SEPOLICY_DIRS.

Signed-off-by: Felix <google@ix5.org>
Change-Id: I7098d05ad6ec4fbddf536582f4820e6ff8d2120e
2019-05-28 14:00:15 +02:00
patricktu ada3a8d5e8 AIDEGen: Add the java sources of host java library modules into module-info.json.
Build module-info.json without this change:
Build time: 2m50.172s
File size: 21,598,737 Bytes

Build module-info.json with this change:
Build time: 2m50.428s
File size: 21,977,565 Bytes

Bug: 133148266
Test: 1. Checkout internal branch
      2. Patch this CL
      3. m -j out/target/product/generic_x86_64/module-info.json
      4. Check the java file exists:
         "GtsBackupHostTestCases": {
	     "srcs": [...,
		      ".../BaseBackupRestoreHostSideTest.java",
		      ...]

Change-Id: I1e1b34592cb7d7abd4634d9cb1a3e276bc1dc7f1
2019-05-27 11:17:55 +00:00
Colin Cross 56199af6c2 Move verify_uses_libraries.sh out of dexpreopt
dexpreopt usually gets a dex jar instead of the final APK, which
means targetSdkVersion can't be parsed out of it.  Move the
shared library verification to a tool that operates on the final
AndroidManifest.xml instead.  verify_uses_libraries.sh is still
used to verify prebuilts where we don't have an AndroidManifest.xml
and must parse it out of the APK.

Test: m Gallery2
Bug: 132357300
Change-Id: I6ade74b6144c73aee094f5d5ff343067ca0a0e5a
2019-05-26 17:42:17 +00:00
Colin Cross 539543990e Don't add dependency on missing optional shared libraries
Filter out LOCAL_OPTIONAL_USES_LIBRARIES entries that are listed
in INTERNAL_PLATFORM_MISSING_USES_LIBRARIES before using them as
a dependency.

Bug: 132357300
Test: m Gallery2
Change-Id: I09bf331f7dc95d1aaa8e5176603bcd343dd93001
2019-05-25 22:02:36 -07:00
Tri Vo bdd494aaa6 Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Bug: 133196056
Test: m selinux_policy
Change-Id: I07166a3d2b3483507db47bdd2daa7a3ad35472ae
2019-05-25 17:35:53 -07:00
Dan Willemsen 753d1ad14e Mark more BUILD_* as obsolete
These have been warnings for a couple weeks now, with no hits.

  BUILD_AUX_EXECUTABLE
  BUILD_AUX_STATIC_LIBRARY
  BUILD_HOST_FUZZ_TEST
  BUILD_HOST_NATIVE_TEST
  BUILD_HOST_STATIC_TEST_LIBRARY
  BUILD_NATIVE_BENCHMARK
  BUILD_STATIC_TEST_LIBRARY

Fixes: 130735607
Fixes: 130735003
Fixes: 130691889
Fixes: 130723134
Fixes: 130722660
Fixes: 130734558
Fixes: 130735594
Test: check all downstream build_test logs
Change-Id: Ia13e59200af8f77a79d6a17d94913b79d8970055
2019-05-25 17:20:38 -07:00