Commit Graph

18163 Commits

Author SHA1 Message Date
Vic Yang
eefd2dbb9e Merge "Revert "Clean up no-vendor-variant VNDK whitelist""
am: f3cae775e9

Change-Id: I42c79c04694fbb3a60197f9f8d8939278f733f10
2020-01-21 12:53:39 -08:00
Vic Yang
f3cae775e9 Merge "Revert "Clean up no-vendor-variant VNDK whitelist"" 2020-01-21 20:45:49 +00:00
Vic Yang
987ebebfbc Revert "Clean up no-vendor-variant VNDK whitelist"
This reverts commit 882e59d45d.

Reason for revert: Breaking build on internal target

Change-Id: I775f120ef140835ee4fe76db5cbbb33255f93b76
2020-01-21 20:38:37 +00:00
Colin Cross
cbbd13f9bc Split the runtime arch property structs into 3
Instead of creating a runtime generated struct type:
struct {
    Arch struct {
        Arm struct {
            Armv7-a struct {
                ...
            }
        }
        ...
    }
    Multilib struct {
        Lib32 struct {
            ...
        }
        ...
    }
    Target struct {
        Android struct {
            ...
        }
        ...
    }
}

Replace it with a top-level struct of empty interfaces:
type archPropRoot struct {
        Arch, Multilib, Target interface{}
}

And then embed nil pointers to smaller structs inside it:
struct {
    Arm struct {
        Armv7-a struct {
            ...
        }
    }
    ...
}

This reduces the maximum number of times the archecture specific
properties are embedded in a runtime generated struct from 139
to 97, which makes it easier to avoid hitting the runtime generated
struct name size limit of 64kB.

Bug: 146234651
Test: all soong tests
Change-Id: I901c434ac9a1d99c74fc2370c5e6803b3682dc73
2020-01-21 11:54:53 -08:00
Martin Stjernholm
72810bcd8a Merge "Add FinalDeps mutator phase, where CreateVariations is disallowed."
am: 3b23789ffa

Change-Id: Iee2374b3235e447812aa4affb26fdbb11cedf40c
2020-01-21 11:48:46 -08:00
Martin Stjernholm
3b23789ffa Merge "Add FinalDeps mutator phase, where CreateVariations is disallowed." 2020-01-21 19:41:54 +00:00
Dan Willemsen
6b78a7fe91 Merge "Python3 on device links against liblog"
am: 5c417b30d0

Change-Id: Iff0e83ff87656fb063de81b16b0bddfc3f65efd4
2020-01-21 10:56:29 -08:00
Treehugger Robot
5c417b30d0 Merge "Python3 on device links against liblog" 2020-01-21 18:50:04 +00:00
Vic Yang
c465d38acd Merge "Clean up no-vendor-variant VNDK whitelist"
am: a07b2f7766

Change-Id: I67908fbc5b173ba16da002215aac18daaa0b5e5d
2020-01-21 10:44:26 -08:00
Treehugger Robot
a07b2f7766 Merge "Clean up no-vendor-variant VNDK whitelist" 2020-01-21 18:38:55 +00:00
Paul Duffin
29f5576357 Remove unused java_sdk_library_import properties
The properties are just passed through to the java_import module that
it creates to import the stubs so could be used if set. However, none
of the current usages of java_sdk_library_import actually set them and
it is not clear why the following would ever be set on
java_sdk_library_import:
* installable
* exclude_files
* exclude_dirs

The above properties look as though they were simply copied from the
ImportProperties struct.

The libs property is also unused but it seems as though it should be
used to improve compatibility with the source module. e.g.
the source module for android.test.runner has android.test.base and
android.test.mock in its libs. However, the prebuilt version of it
does not.

Bug: 148080325
Test: m nothing
Change-Id: I710e3962b2e34b2b0cc81685d07d4948cef4e6ad
2020-01-21 18:37:58 +00:00
Vic Yang
882e59d45d Clean up no-vendor-variant VNDK whitelist
First round of cleaning. Remove VNDK libraries that
already have identical variants.

Bug: 148082691
Test: Build success
Change-Id: I97f946a2cbf459b607a73e766db9fb8d7655f220
2020-01-21 18:33:44 +00:00
Stephen Hines
51fd7fd318 Merge "Default to pattern initialization for uninitialized variables."
am: b9b979c8aa

Change-Id: I9f17d6ec8f8952d0bec9d87216b2b3d21f599947
2020-01-21 10:12:27 -08:00
Stephen Hines
b9b979c8aa Merge "Default to pattern initialization for uninitialized variables." 2020-01-21 18:06:31 +00:00
Pete Gillin
42a16b7d69 Merge "Revert "Allow codename.fingerprint format for minSdkVersion""
am: 070d69c74c

Change-Id: Iaa25e4c1211e370a5c520c0a96ba4fd5f6dff42f
2020-01-21 06:16:35 -08:00
Pete Gillin
070d69c74c Merge "Revert "Allow codename.fingerprint format for minSdkVersion"" 2020-01-21 14:11:18 +00:00
Pete Gillin
230e241f58 Revert "Allow codename.fingerprint format for minSdkVersion"
This reverts commit 014a85712d.

Reason for revert: Caused vendor/google/build/build_mainline_modules.sh to fail with `Error: minSdkVersion (10000) is greater than maxSdkVersion (30)`.

Bug: 130541924
Change-Id: Ifa233bf40a674481d21b61ee816c5fdde8201080
2020-01-21 13:44:50 +00:00
Martin Stjernholm
710ec3aef2 Add FinalDeps mutator phase, where CreateVariations is disallowed.
This is for use to add dependencies between specific module variants,
without getting the dependencies potentially duplicated as more
variants are created.

Moved genrule tool dependency registration to this phase, to avoid
potential splitting of its dependencies, and for consistency with the
same kind of dependency on dex2oat in https://r.android.com/1205730.

Test: m nothing
Bug: 145934348
Change-Id: I1f9e75354e359cef5f41d14e5016b0a67d7655d7
2020-01-21 11:40:02 +00:00
Dan Willemsen
d7a1dee1c1 Python3 on device links against liblog
Fixes: 148037229
Test: cherry-pick https://r.android.com/1212194; m try_python_binary_test
Change-Id: I6e26ba232d7698a4889a6e0be1aeb09d54cc4dc5
2020-01-20 22:14:45 -08:00
Paul Duffin
b472304a75 Merge "Use deep copy when copying bpPropertySets"
am: 515f043a6b

Change-Id: I971864e382755ea04984e0b5c30f905c59f6ac11
2020-01-20 20:08:26 -08:00
Treehugger Robot
515f043a6b Merge "Use deep copy when copying bpPropertySets" 2020-01-21 03:41:56 +00:00
Baligh Uddin
da726a802c Merge "Allow codename.fingerprint format for minSdkVersion"
am: 1cc755ac9f

Change-Id: I51ea6c537f23d657f8750e8261f57a9b8a891584
2020-01-20 18:10:19 -08:00
Baligh Uddin
1cc755ac9f Merge "Allow codename.fingerprint format for minSdkVersion" 2020-01-21 01:08:14 +00:00
Artur Satayev
b01dd44266 Use merge_csv python_binary.
Instead of using .py file directly.

Bug: 145132366
Test: diff -w out/soong/hiddenapi/hiddenapi-greylist.csv
Change-Id: Ib79019234b4ae05486e831b30d27bd1be3bbba67
2020-01-20 17:59:02 +00:00
Paul Duffin
cc72e981c7 Use deep copy when copying bpPropertySets
Previously, only a shallow copy was made so the copy ends up sharing
some contents with the original. That was a potential source of bugs
as the copy was being made in order to be mutated.

This change switches to a deep copy; renaming the methods from
copy -> deepCopy to clarify the intent.

Makes the bpPropertySet member of bpModule a *bpPropertySet to avoid
unnecessary copying of bpPropertySet.

Bug: 142940300
Test: m nothing
Change-Id: I3f2eaa9fffab4e61d5a7cec81aa42fee9fdfec44
2020-01-20 17:12:58 +00:00
Baligh Uddin
014a85712d Allow codename.fingerprint format for minSdkVersion
Use codename.fingerprint format for minSdkVersion if it is unset
in the manifest and
UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true.

Using a utility function in sdk.go to check whether to apply
api.fingerprint.

BUG: 130541924
Change-Id: I748a25c419033bf54b63171d334644fcd0ecc78f
2020-01-20 07:46:12 -08:00
Martin Stjernholm
b7be1acd0b Merge "Clarify a bit more what apex_available means."
am: dca59a516d

Change-Id: I9bac472d130408550edd9d9b5847cad0a6665d1a
2020-01-20 05:12:32 -08:00
Treehugger Robot
dca59a516d Merge "Clarify a bit more what apex_available means." 2020-01-20 13:07:07 +00:00
Jiyong Park
7cd10e3908 Reland "use symlink for bundled APEX"
This reverts commit 31c65d4fe4.

Bug: 144533348

Test: checkout master-art-host and run
ALLOW_MISSING_DEPENDENCIES=true DIST_DIR=out/dist /art/tools/dist_linux_bionic.sh -j80 com.android.art.host
the result is successful

Change-Id: Ica11eec9b64867088b16720a41c6d83905976ec5
2020-01-20 15:13:31 +09:00
Hsin-Yi Chen
4ced3e137a Merge "Do not create ABI dumps for NDK stub libraries"
am: a22f30e0c9

Change-Id: Iefed80a035f623cc0427de22a3aa025f271a3b43
2020-01-19 18:16:35 -08:00
Hsin-Yi Chen
a22f30e0c9 Merge "Do not create ABI dumps for NDK stub libraries" 2020-01-20 02:11:16 +00:00
Colin Cross
5170ca4d2d Merge "Add total build time to metrics"
am: 5fdf5d4b3e

Change-Id: Ie2787f81585f32e96c461606fba6bb56c07909d1
2020-01-17 14:45:49 -08:00
Treehugger Robot
5fdf5d4b3e Merge "Add total build time to metrics" 2020-01-17 22:39:11 +00:00
Vic Yang
b85b6d03aa Add OWNERS for cc/config/vndk.go
am: ff9f7fb26a

Change-Id: I44c85b93edfbe2eefa5fbdf9a14172725ae29ecc
2020-01-17 14:25:31 -08:00
Jaewoong Jung
b3dd640c9f Merge "Overwrite test-file-name in test config."
am: a929cd52ce

Change-Id: Ibdbf134097301e5345c0d687630e74e0b9e61513
2020-01-17 13:34:51 -08:00
Yi Kong
b13d81ba3b Merge "Add "-no-warn-sample-unuse=true" to work around AutoFDO issue"
am: d810312751

Change-Id: I4889db3de3dc62d5261d19bc627c1aae1ec30318
2020-01-17 13:32:20 -08:00
Anton Hansson
cace120a56 Merge "Add framework-sdkextensions to jars to instrument"
am: af0133388b

Change-Id: I0bba2bd3bb7ad51e5f1e3a439dabaa561c9bae8f
2020-01-17 13:07:43 -08:00
Vic Yang
38166bf1d0 Merge changes from topic "vndkvariantcheck"
am: 3fbe62b57d

Change-Id: I8b16aa1041456254fa5539cd5dfbfd1e6f45fa45
2020-01-17 12:28:37 -08:00
Vic Yang
ff9f7fb26a Add OWNERS for cc/config/vndk.go
This file contains only a list of VNDK libraries that are allowed to
have different VNDK variant behaviors.

Test: N/A
Change-Id: I9e395b82b8006133294cf325e4626c1b34053588
2020-01-17 11:23:14 -08:00
Jaewoong Jung
a929cd52ce Merge "Overwrite test-file-name in test config." 2020-01-17 19:07:12 +00:00
Yi Kong
d810312751 Merge "Add "-no-warn-sample-unuse=true" to work around AutoFDO issue" 2020-01-17 19:04:23 +00:00
Anton Hansson
af0133388b Merge "Add framework-sdkextensions to jars to instrument" 2020-01-17 18:48:58 +00:00
Treehugger Robot
3fbe62b57d Merge changes from topic "vndkvariantcheck"
* changes:
  vndkMustUseVendorVariant += libstagefright_bufferpool@2.0
  Emit LOCAL_CHECK_SAME_VNDK_VARIANTS
2020-01-17 18:45:43 +00:00
Jaewoong Jung
3998234d8c Overwrite test-file-name in test config.
If the install apk name is different than the module name, use
test_config_fixer to update the test-file-name value in the config.

Test: app_test.go
Fixes: 147375216
Change-Id: I2141eeebbb3552995400b45634712306673fd812
2020-01-17 06:08:12 -08:00
Martin Stjernholm
06ca82d6ff Clarify a bit more what apex_available means.
Test: n/a - comment change only
Change-Id: I5311dca32a4e43c3765a3ea26d2b8781ce113433
2020-01-17 13:02:56 +00:00
Automerger Merge Worker
87318085ca Merge "Dedup cc binary build components registration" am: e24093a784
Change-Id: I671227906222038e87f0a94b05f1674bf7ad9e5d
2020-01-17 11:21:11 +00:00
Treehugger Robot
e24093a784 Merge "Dedup cc binary build components registration" 2020-01-17 11:11:50 +00:00
Anton Hansson
91133e6e44 Add framework-sdkextensions to jars to instrument
Required to get code coverage.

Bug: 143937446
Test: verify LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR is set
      for framework-sdkextensions
Change-Id: I2cdb8ce60939a91f8473c2ddd2a8ff198cd7c92e
Merged-In: I2cdb8ce60939a91f8473c2ddd2a8ff198cd7c92e
(cherry picked from commit 9492b09dae)
2020-01-17 09:57:52 +00:00
Automerger Merge Worker
7f27094930 Merge "Build kzip for Go files in build/blueprint directory." am: 26691c094d
Change-Id: Idf68059fb4e81434eb4c71a6700f168ea0321cbb
2020-01-17 08:08:26 +00:00
Treehugger Robot
26691c094d Merge "Build kzip for Go files in build/blueprint directory." 2020-01-17 07:58:43 +00:00