Nick Kralevich
f771d64bcb
Merge "Update OTA to understand SELinux filesystem labels"
2013-07-18 22:25:59 +00:00
Jeff Brown
4e361bf692
Merge "Split framework jar."
2013-07-18 22:12:37 +00:00
Nick Kralevich
fbbd79530a
Update OTA to understand SELinux filesystem labels
...
Make fs_config aware of SELinux contexts, and output the context
whenever we output the UID / GID / file perms.
Pass the selinux context to the set_perm2() and set_perm2_recursive()
calls. When the OTA script fixes up filesystem permissions, it will
also fix up the SELinux context on the files.
Bug: 8985290
Change-Id: I6419b64c06309a93ac6b2f2cf9fc7f8815adeaf3
2013-07-18 15:04:22 -07:00
Ying Wang
8bf79bb081
am 8bb3306b
: am a1f8cdf7
: Merge "Allow several system property files"
...
* commit '8bb3306b76bf3a20fc0f0634a492c5c18550c8e3':
Allow several system property files
2013-07-18 10:07:09 -07:00
Ying Wang
8bb3306b76
am a1f8cdf7
: Merge "Allow several system property files"
...
* commit 'a1f8cdf74bcc35110bd306d633e019a6279fc7fe':
Allow several system property files
2013-07-18 10:02:45 -07:00
Jeff Brown
ae859f9b64
Split framework jar.
...
Change-Id: I38c68ac169a4ea10e4640b5d8e24298a6caaf441
2013-07-17 21:08:18 -07:00
Johan Redestig
674a27ddaf
Allow several system property files
...
TARGET_SYSTEM_PROP now is a list of files and all of them
are included in the build.prop.
Change-Id: I494f86412b0a299ee4c066e49ab4f4686bc2178a
2013-07-16 15:15:16 +02:00
Brian Carlstrom
8abff76d8f
Add LOCAL_ADDITIONAL_DEPENDENCIES support to BUILD_PHONY_PACKAGE
...
Change-Id: I0211600ebb554b55f3823a4cb3d119b95cb49733
2013-07-15 16:44:26 -07:00
Ying Wang
6e9151b1a7
am 988251c9
: Fix error.
...
* commit '988251c92269676c891dcb548fecdc100755b431':
Fix $(so_suffix) error.
2013-07-15 09:01:59 -07:00
Ying Wang
988251c922
Fix $(so_suffix) error.
...
Change-Id: I32cb4d4efe0a473e67a54c035df4dd82b6e4a3f0
(cherry picked from commit 80b71fa326
)
2013-07-15 15:57:25 +00:00
Ying Wang
80b71fa326
Fix $(so_suffix) error.
...
Change-Id: I32cb4d4efe0a473e67a54c035df4dd82b6e4a3f0
2013-07-15 08:47:33 -07:00
Ying Wang
3aa8eb6810
am ba9636d4
: Establish the built module dependencies on prebuilt shared library
...
* commit 'ba9636d47fdc91c4caca6c9e0ad618956ddbb98b':
Establish the built module dependencies on prebuilt shared library
2013-07-12 22:34:46 -07:00
Ying Wang
ba9636d47f
Establish the built module dependencies on prebuilt shared library
...
This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.
Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
(cherry picked from commit ada8f29657
)
2013-07-13 05:31:11 +00:00
Ying Wang
ada8f29657
Establish the built module dependencies on prebuilt shared library
...
This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.
Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
2013-07-12 22:05:14 -07:00
JP Abgrall
1390cac3ce
core: don't hardcode "out" during findleaves.py invocations.
...
"out" can be $OUT_DIR
Bug: 7183057
Change-Id: I7b52d40de4398f481e47f6d6d719fb550d874f73
2013-07-11 19:08:06 -07:00
Jeff Brown
85fe0c5446
am 9d80f708
: am a3d60ae8
: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
...
* commit '9d80f7085707abd8f088c4f0c4d66cd666a6feb0':
Revert "Remove mediarouter v7 support library from SDK."
2013-07-11 10:17:00 -07:00
Ying Wang
fd30db5f29
Merge "Bring in runtime-specific product variables in a more general way."
2013-07-11 01:23:29 +00:00
Ying Wang
22ef79850e
Bring in runtime-specific product variables in a more general way.
...
Change-Id: Ibd0e0e8e3e0ca6afd125db8035ce08a7399b7547
2013-07-10 18:14:40 -07:00
Ying Wang
6238cd9185
Demultiplex the coretests description rules
...
Previously for each target generate-core-test-description will be called
6 times that end in 6x6 calls of the function.
That's unnecessary and unsafe.
Change-Id: I03eef89b61c552b5f47f0a478feb9687fd9717da
2013-07-10 16:58:52 -07:00
Ying Wang
51a1ae1d24
Clean up files' dependencies on phony targets.
...
Module names are phony targets, which make always sees as obsolete,
so a nothing-to-do build won't do nothing.
Also file target $(DEFAULT_TEST_PLAN) was never created in its rule.
Here it's fixed with a stamp file.
Bug:9761012
Change-Id: Ic82df70cc22643d902017b5bec1022404d9bbfce
2013-07-10 11:33:27 -07:00
Jeff Brown
9d80f70857
am a3d60ae8
: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
...
* commit 'a3d60ae86f112388c27b4a164f269efd5f6d1c72':
Revert "Remove mediarouter v7 support library from SDK."
2013-07-09 16:48:17 -07:00
Jeff Brown
a3d60ae86f
Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
2013-07-09 23:44:41 +00:00
Jeff Brown
9977ddf0cd
Revert "Remove mediarouter v7 support library from SDK."
...
This reverts commit 0eacd936b7
.
Bug: 9425325
Change-Id: Idf81e6721fb4361a38ffd73d39c574c2cb2b1155
2013-07-09 00:35:00 +00:00
Ying Wang
f755fa0d8c
am d235ed2a
: Respect DISABLE_PROGUARD
...
* commit 'd235ed2afb29101cc3e03e7bb692637ad67b48ad':
Respect DISABLE_PROGUARD
2013-06-28 13:43:25 -07:00
Ying Wang
d235ed2afb
Respect DISABLE_PROGUARD
...
The flag is only used by unbundled build currently.
Change-Id: I8e9bab69dd7accae52ec8cdd627fc4e24178a790
2013-06-28 13:37:27 -07:00
Brian Carlstrom
1aeee8bb66
Move from WITH_ART to PRODUCT_RUNTIMES
...
Change-Id: I3a9217b4aafc1f59d095169deb9eaeae17320505
2013-06-27 16:49:15 -07:00
Ying Wang
fcec57a116
Allow to run checkbuild in sdk build.
...
Bug: 9594464
Change-Id: Ia02e7d8fc157cdfe2e065ce9e42a3800457f89f6
2013-06-26 18:00:17 -07:00
Ying Wang
4c4b6b2a0b
am f84bf8d0
: Fix use of LOCAL_CLASSPATH in droiddoc.mk
...
* commit 'f84bf8d0ca954e7a0768cb5c0d1024fa26a72756':
Fix use of LOCAL_CLASSPATH in droiddoc.mk
2013-06-25 14:13:09 -07:00
Ying Wang
f84bf8d0ca
Fix use of LOCAL_CLASSPATH in droiddoc.mk
...
Remove the unnecessary use of LOCAL_STATIC_JAVA_LIBRARIES.
You should use LOCAL_JAVA_LIBRARIES in that case.
Change-Id: I0b51b5b22530722e48193e5b4e964e8835f193af
(cherry picked from commit 8578cab066
)
2013-06-25 21:05:11 +00:00
Ying Wang
8578cab066
Fix use of LOCAL_CLASSPATH in droiddoc.mk
...
Remove the unnecessary use of LOCAL_STATIC_JAVA_LIBRARIES.
You should use LOCAL_JAVA_LIBRARIES in that case.
Change-Id: I0b51b5b22530722e48193e5b4e964e8835f193af
2013-06-25 12:34:11 -07:00
Ying Wang
10e41c3275
am c012edbc
: am 42aaacf1
: am a90d7eb6
: Merge "Do not use -msynci flag for Xburst 4780 cores"
...
* commit 'c012edbc519b74456530c26719133f96d4574de3':
Do not use -msynci flag for Xburst 4780 cores
2013-06-21 10:44:47 -07:00
Ying Wang
c012edbc51
am 42aaacf1
: am a90d7eb6
: Merge "Do not use -msynci flag for Xburst 4780 cores"
...
* commit '42aaacf183b0ee7af989d2fce1d8b29401dfb61a':
Do not use -msynci flag for Xburst 4780 cores
2013-06-21 10:42:32 -07:00
Ying Wang
42aaacf183
am a90d7eb6
: Merge "Do not use -msynci flag for Xburst 4780 cores"
...
* commit 'a90d7eb64fc3155c6558d9c307e0bc4a2d84dff9':
Do not use -msynci flag for Xburst 4780 cores
2013-06-21 10:37:38 -07:00
Raghu Gandham
6faf71647a
Do not use -msynci flag for Xburst 4780 cores
...
synci does not provide coherency between CPU's on this device
Change-Id: I10e73fa49859e55d018884c6682b5a00b887e0a1
Signed-off-by: Chris Dearman <chris.dearman@imgtec.com >
2013-06-20 13:29:49 -07:00
Jeff Brown
c39063df9b
am bd1c3a21
: am 0eacd936
: Remove mediarouter v7 support library from SDK.
...
* commit 'bd1c3a2112d023e9f0aab115c64ba345c666ebe5':
Remove mediarouter v7 support library from SDK.
2013-06-14 16:43:23 -07:00
Jeff Brown
bd1c3a2112
am 0eacd936
: Remove mediarouter v7 support library from SDK.
...
* commit '0eacd936b7d6dabd380ecd6f1d25d39625b37495':
Remove mediarouter v7 support library from SDK.
2013-06-14 16:42:09 -07:00
Jeff Brown
0eacd936b7
Remove mediarouter v7 support library from SDK.
...
Bug: 9425325
Change-Id: Iba64455cf8bcf4892ff9bf10628e7b5272787a1e
2013-06-14 15:46:29 -07:00
Mike Lockwood
051a1740eb
Add support for WITHOUT_CLANG
...
Change-Id: I12e776e44c69649bca34c35eff2ee7c75cfe62cd
2013-06-14 10:52:50 -07:00
Ying Wang
951e0f1e8d
am fe365531
: am 1e1241ce
: Dist static Java library modules.
...
* commit 'fe365531b0ee363640fb50d5a230c0b999fbbe4d':
Dist static Java library modules.
2013-06-12 15:41:57 -07:00
Ying Wang
fe365531b0
am 1e1241ce
: Dist static Java library modules.
...
* commit '1e1241ce3d4259bcc4a0039ed68fc5b3fc8069b5':
Dist static Java library modules.
2013-06-12 15:38:05 -07:00
Ying Wang
1e1241ce3d
Dist static Java library modules.
...
With this change, we can build and dist static jar files, as well as
apks.
Bug: 9386024
Change-Id: Iab4660d8dfd7a2d164714a2124445de298075901
2013-06-12 15:29:38 -07:00
Ying Wang
8f5868057c
am 38cdd442
: Tweak proguard flags in the 2 files.
...
* commit '38cdd4429f23d9a0d27a6d8cfe318c29b604afbf':
Tweak proguard flags in the 2 files.
2013-06-12 11:09:33 -07:00
Ying Wang
38cdd4429f
Tweak proguard flags in the 2 files.
...
So all most commonly-used flags go to proguard_basic_keeps.flags
and they will still be applied when LOCAL_PROGUARD_ENABLED=nosystem.
Bug: 9203442
Change-Id: If018076dc625ac1efe31898b179dbba850218aaf
2013-06-12 11:04:49 -07:00
Torne (Richard Coles)
4297ce7d0e
Merge "Add webviewchromium to the preopt jar list."
2013-06-11 13:13:45 +00:00
Ying Wang
d72db32f84
Remove unnecessary dependencies between host and target modules.
...
With this change, modules introduced by LOCAL_REQUIRED_MODULES will be
split by host/target: target modules only depend on target modules and
host modules only depend on host modules.
Bug: 9303948
Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
2013-06-06 18:05:53 -07:00
Torne (Richard Coles)
ef5d599600
Add webviewchromium to the preopt jar list.
...
The default BOOTCLASSPATH now includes webviewchromium.jar, so also add
it to the dex_preopt list.
Change-Id: I67b87cb0bf997c74596c276314a5196f8cf0d1b4
2013-06-06 14:57:42 +01:00
Torne (Richard Coles)
d919c7a314
Add proper deps for jarjar rules files.
...
Changes to the jarjar rules file for a module were not causing
rebuilds; add the missing dependency.
Change-Id: Ib78fa708681cbc414218fe84cc2c4282c619f45f
2013-06-05 14:25:47 +01:00
Ying Wang
8216f3228f
Merge "Tweak proguard flags in the 2 files."
2013-05-31 15:24:56 +00:00
Stephen Hines
1e18897689
am 6c380fe5
: am 1dd9f19e
: Merge "add renderscript to support library javadocs" into jb-mr2-dev
...
* commit '6c380fe5da492c526f81c894a069e63ab62613de':
add renderscript to support library javadocs
2013-05-30 15:34:00 -07:00
Stephen Hines
6c380fe5da
am 1dd9f19e
: Merge "add renderscript to support library javadocs" into jb-mr2-dev
...
* commit '1dd9f19e8f020e691f08361668a1132181c267c5':
add renderscript to support library javadocs
2013-05-30 14:14:29 -07:00