Commit graph

5554 commits

Author SHA1 Message Date
Colin Cross
5ab4e6d817 Allow building framework.jar and framework-res.apk
Update app support enough to build framework-res.apk, link
framework.jar against its generated files, and export it to
make.

Bug: 69917341
Test: m checkbuild tests docs
Change-Id: I7db29cd1f5fabb22e844483ecc7c38abfedbbe0a
2017-11-29 20:47:42 -08:00
Colin Cross
b3280409fd Merge changes Ic88be643,Ibe21efde
am: 46029a4131

Change-Id: I53d8eefa3f818ce1979f19fbe01f8523b045fb3c
2017-11-30 02:32:02 +00:00
Treehugger Robot
46029a4131 Merge changes Ic88be643,Ibe21efde
* changes:
  Replace ModuleContext.AConfig() with Config()
  Make *Context.Config return a Config instead of a interface{}
2017-11-30 02:21:30 +00:00
Chih-Hung Hsieh
9741b57ad8 Merge "Reduce WarningAllowedProjects."
am: c92168f08d

Change-Id: I9220f79e14be9a3445445e35d985c66ede128d87
2017-11-30 00:53:32 +00:00
Jeff Gaston
dd5e9980ce Revert "Soong support for namespaces"
am: 178d5fefc0

Change-Id: Ib1d57b0d7d9f914d24c3f6fbef91d8d02821b65f
2017-11-30 00:53:02 +00:00
Colin Cross
eb2f0d255e Convert a missed Singleton
am: 54855ddca4

Change-Id: I3dc101f9a5ffdfb1d0994ff0f4f3b08693cb8b17
2017-11-30 00:52:43 +00:00
Colin Cross
044c46b1d5 Fix aapt2
am: 44f066895d

Change-Id: I1aa3790a982d2ea64e66debf372096468236be63
2017-11-30 00:52:23 +00:00
Treehugger Robot
c92168f08d Merge "Reduce WarningAllowedProjects." 2017-11-30 00:44:57 +00:00
Colin Cross
6510f91a1c Replace ModuleContext.AConfig() with Config()
AConfig() now duplicates Config().  Replace the uses of AConfig()
with Config().  Leave AConfig() for now until code in other
projects is cleaned up.

Test: m checkbuild
Change-Id: Ic88be643049d21dba45dbd1a65588ed94bf43bdc
2017-11-30 00:44:18 +00:00
Colin Cross
aabf67968c Make *Context.Config return a Config instead of a interface{}
In Soong, a Config() method will always return a Config.  Make
ModuleContext, SingletonContext, TopDownMutatorContext and
BottomUpMutatorContext's Config() methods explictly return
a Config to avoid having to type-assert everywhere.  Overriding
the Config method requires duplicating the list of methods in
blueprint.BaseModuleContext and blueprint.BottomUpMutatorContext,
following the same pattern used by the other *Contexts.

Config() obsoletes the AConfig() method used in some places, which
will be cleaned up in the next patch.

Test: m checkbuild
Change-Id: Ibe21efde933959811d52443496967ab8ce71215e
2017-11-30 00:44:11 +00:00
Jeff Gaston
178d5fefc0 Revert "Soong support for namespaces"
This reverts commit 63a250a336.

Reason for revert: Some failures:
  namespace_test.go:648: dir1/Blueprints:2:4: a namespace must be the first module in the file 
  such as New Build Breakage: aosp-master/build_test @ 4475274

Change-Id: I1b5db8eb934e51ff22241bfca44199d886b1393b
2017-11-30 00:43:43 +00:00
Colin Cross
54855ddca4 Convert a missed Singleton
Convert EnvSingleton to android.SingletonFactory.

Test: m checkbuild
Change-Id: Ia18b0b97718ba7c08d3f136f6f4096477d90c0f4
2017-11-30 00:42:49 +00:00
Colin Cross
44f066895d Fix aapt2
Fix some ninja variable issues in the aapt2 rules.  These were
caught by app_test.go, but that wasn't being run automatically,
so add it to testSrcs.

Test: app_test.go
Change-Id: Ia01dda45ba5ced9c304056939c0e69f170c15de3
2017-11-30 00:40:38 +00:00
Jeff Gaston
8f4be880b0 Merge "Soong support for namespaces"
am: a8063afc16

Change-Id: I98394fcd7f19b3e64c06527212056660d94eb670
2017-11-29 23:10:51 +00:00
Jeff Gaston
a8063afc16 Merge "Soong support for namespaces" 2017-11-29 23:01:39 +00:00
Chih-Hung Hsieh
0082636a14 Reduce WarningAllowedProjects.
* Warnings were fixed or suppressed in these projects.

Test: normal build
Change-Id: I5eec81704472c1675adf5fa784112c025f3c0222
2017-11-29 13:52:26 -08:00
Colin Cross
2293f412e9 Merge "Revert "Revert "Test for dangling rules in make checkbuild"""
am: b8160761f7

Change-Id: Icd96a71c16017fe8875c2e1fdac7c937f5ad8f97
2017-11-29 21:21:10 +00:00
Treehugger Robot
b8160761f7 Merge "Revert "Revert "Test for dangling rules in make checkbuild""" 2017-11-29 21:09:48 +00:00
Jeff Gaston
63a250a336 Soong support for namespaces
Bug: 65683273
Test: build/soong/scripts/diff_build_graphs.sh \
      --products=aosp_arm \
      'build/blueprint:work^ build/soong:work^' \
      'build/blueprint:work build/soong:work'
      # and see that the only changes were:
      # 1. adding some new files
      # 2. changing some line numbers
Test: m -j nothing # which runs unit tests

Change-Id: I6d3e52ef62c4cabe85b9a135a54de0e1a6aab29c
2017-11-29 13:03:40 -08:00
Jeff Gaston
e840be1bbc Merge "Have androidmk ignore all-makefiles-under"
am: f94700b563

Change-Id: Id0100a20aa8d33012f2a61d1544619ca0d37df82
2017-11-29 21:01:39 +00:00
Jeff Gaston
0c573d383d Have diff_build_graphs.sh print the number of lines in the diff
Bug: b/69133815
Test: build/soong/diff_build_graphs.sh \
      'build/soong:work^' 'build/soong:work'

Change-Id: Iaeb66ba53e1b3d7ddd4b4551b3ac29b12ce227c5
2017-11-29 12:54:43 -08:00
Treehugger Robot
f94700b563 Merge "Have androidmk ignore all-makefiles-under" 2017-11-29 20:53:38 +00:00
Jeff Gaston
aa2476bd42 Merge "Sort cfi static libs to make them consistent"
am: 5313911912

Change-Id: Ifa11246b0a9203ba785a4d4c6614d93cc23b8643
2017-11-29 20:10:05 +00:00
Jeff Gaston
5313911912 Merge "Sort cfi static libs to make them consistent" 2017-11-29 19:58:38 +00:00
Dan Shi
d3d2160907 Merge "Add TEST_MAPPING to finder's cache"
am: 8763169bdb

Change-Id: Ibf48f4660c2cd6a38c1434e142df17e922906d9f
2017-11-29 19:35:01 +00:00
Treehugger Robot
8763169bdb Merge "Add TEST_MAPPING to finder's cache" 2017-11-29 19:16:50 +00:00
Colin Cross
59e3bc2596 Replace aapt support with aapt2
am: 3bc7ffa59b

Change-Id: I9d7420a12e617ecd8dc77811a956f99ac7f19b2d
2017-11-29 05:18:09 +00:00
Colin Cross
a0a0b7fd90 Wrap PackageContext and SingletonContext
am: 0875c52de7

Change-Id: Ibffbf49a34a1ca042cc21f79f8aacfe62695e87e
2017-11-29 05:18:07 +00:00
Colin Cross
3bc7ffa59b Replace aapt support with aapt2
Use aapt2 instead of aapt to compile Android app resources.
Also generate all files into srcjars instead of individual
sources.

Test: m checkbuild
Change-Id: I5a67991a0daf0017e8159b46fcff7d5564a91468
2017-11-29 05:05:07 +00:00
Colin Cross
0875c52de7 Wrap PackageContext and SingletonContext
Wrap blueprint.PackageContext so that the *Func methods can provide
an android.Config instead of an interface{}.  The modified signatures
means that every method in ModuleContext and SingletonContext
that takes a blueprint.PackageContext now needs to be wrapped to
take an android.PackageContext.

SingletonContext wasn't previously wrapped at all, but as long
as it is, wrap everything like ModuleContext does.  This requires
updating every Singleton to use the android-specific methods.

Test: builds, all Soong tests pass
Change-Id: I4f22085ebca7def6c5cde49e8210b59d994ba625
2017-11-29 05:04:30 +00:00
Jeff Gaston
7276539d6a Sort cfi static libs to make them consistent
To make it easier to diff the ninja files with diff_build_graphs.sh
Bug: b/69133815
Test: m -j

Change-Id: Ic08094f7dc3adb773ebb64a7d34125fc24641bf3
2017-11-28 16:39:12 -08:00
Elliott Hughes
29e5618645 Merge "Skip MIPS headers when generating NDK prebuilts"
am: f2a56f0e0d

Change-Id: Ic58dfe5ae30e80f57860226289b35a3d88a50ee9
2017-11-28 23:38:55 +00:00
Elliott Hughes
f2a56f0e0d Merge "Skip MIPS headers when generating NDK prebuilts" 2017-11-28 23:26:03 +00:00
Jayant Chowdhary
eb11ca9596 Merge "Copy abidiffs into /abidiffs on abi breakages."
am: 3e6584556d

Change-Id: I755837f010548dc8b9dec4350058aac7768a17e4
2017-11-28 22:47:02 +00:00
Jayant Chowdhary
3e6584556d Merge "Copy abidiffs into /abidiffs on abi breakages." 2017-11-28 22:38:32 +00:00
Jeff Gaston
0d83b8c9fe Have androidmk ignore all-makefiles-under
That's automatically implemented now by the finder

Bug: b/37748825
Test: m -j nothing # which runs unit tests
Change-Id: Ie17907733a744dc97cd24c90bed73b4731e878ad
2017-11-28 14:24:24 -08:00
Colin Cross
292325153d Merge "Move java test resources in mock filesystem to a different directory"
am: 88c24a38e5

Change-Id: I3ac5d48b76d9714c7fd0c5552595f46775e58188
2017-11-28 21:32:37 +00:00
Colin Cross
88c24a38e5 Merge "Move java test resources in mock filesystem to a different directory" 2017-11-28 21:24:52 +00:00
Colin Cross
1d2845e46f Merge "Add Jacoco support"
am: 8b732c1cd5

Change-Id: I02f865600d9aa119a04e04c1a0b67b1d54826d54
2017-11-28 21:18:51 +00:00
Colin Cross
8b732c1cd5 Merge "Add Jacoco support" 2017-11-28 21:10:57 +00:00
Colin Cross
ff9ff4695f Merge changes from topic "pathtools.Match"
am: 496d057ef3

Change-Id: I57db377973f14a6c8b206ff4a2ba76c4cde7cf91
2017-11-28 20:55:04 +00:00
Colin Cross
5579297d88 Support exclusions and Blueprint-style ** globs in zip2zip
am: f3831d0e08

Change-Id: I7968a56495aa661437180e43a27ae36029216ce9
2017-11-28 20:54:51 +00:00
Colin Cross
496d057ef3 Merge changes from topic "pathtools.Match"
* changes:
  Add support for --ignore_duplicates to merge_zips
  Support exclusions and Blueprint-style ** globs in zip2zip
2017-11-28 20:45:38 +00:00
Jeff Gaston
f93e082b68 Merge "Have Soong cc static linker dep order account for shared deps too"
am: 5921ab3347

Change-Id: I0d4169273c124230c0be9ecaacd78cb1d820df27
2017-11-28 20:37:04 +00:00
Jeff Gaston
5921ab3347 Merge "Have Soong cc static linker dep order account for shared deps too" 2017-11-28 20:28:29 +00:00
Colin Cross
15bf63051c Fix passing dex_preopt value to make
am: b4972e3d96

Change-Id: I84e338b3f4dde5dea81ce4f18da1ed33bc0ffc41
2017-11-28 19:51:59 +00:00
Lazar Trsic
cdb710fed5 Skip MIPS headers when generating NDK prebuilts
When generating NDK prebuilts, skip installing MIPS headers, but keep
them when doing regular platform build. Ndk_abis property is only set
to true with build/soong/scripts/build-ndk-prebuilts.sh

Revert this once MIPS is supported in NDK again.

This effectively skips installing the following header modules when
creating NDK prebuilts:
- libc_asm_mips
- libc_asm_mips64

This fixes the issue introduced by commit:
050f046 Remove mips/mips64 headers from the NDK sysroot.

Test: build/soong/scripts/build-ndk-prebuilts.sh
Test: build aosp_mips[64]-eng

Change-Id: I3af73649bc8ac304bca0e21ec81f156abe546c90
Signed-off-by: Lazar Trsic <Lazar.Trsic@mips.com>
2017-11-28 15:07:16 +01:00
Jayant Chowdhary
219139df8c Copy abidiffs into /abidiffs on abi breakages.
Bug: 64267858

Test: create reference abi dump for libjpeg locally. Change return type
      of libjpeg_std_err and build with :
      BOARD_VNDK_VERSION=current mm -j64 showcommands dist
      Build fails and abidiff report gets copied into out/dist/abidiffs.

Change-Id: I7c8ecfac95361e731009e5913bd3a7bb323a9597
2017-11-27 17:16:29 -08:00
Jeff Gaston
f5b6e8f8c7 Have Soong cc static linker dep order account for shared deps too
Bug: b/69639803
Test: m -j nothing # which runs unit tests
Test: m -j checkbuild
Change-Id: I2eedfe8b88ec5c715ef729bf113d168a2bc3524d
2017-11-27 17:14:06 -08:00
Colin Cross
37193495cf Revert "Revert "Test for dangling rules in make checkbuild""
This reverts commit fb941913a3.

Reapplies I4933187e8b72f2ef0c32d18ffea756e2c6fa417c with fixes
to disable the check for mac builds, where many modules are
disabled and the check is just going to cause more problems.

Test: m checkbuild
Change-Id: If6712c90ececd5d015fcdcdeefe0c3d4f5590711
2017-11-25 05:26:10 +00:00