Commit Graph

2598 Commits

Author SHA1 Message Date
Kevin Hester
6c703628c5 Allow packages to place manifest files in any directory
via a new definition LOCAL_ABS_MANIFEST_FILE.  The existing
LOCAL_MANIFEST_FILE variable will also be supported.

(Necessary if manifests are being programmatically generated in the
intermediates directory)

Change-Id: I77a8eb1b8040b966b944464281d00c161ff34d3c
2012-04-12 15:35:53 -07:00
Colin Cross
dc8f8e4a75 Merge event-log-tags from platform.zip with local *.logtags
PDK fusion builds will include system/etc/event-log-tags from a full
build from platform.zip, which needs to be merged into the event-log-tags
built locally based on *.logtags from projects that have source.

Bug: 6297675
Change-Id: I91409f37c6dc88d6942eade2946155c2a6640b6f
2012-04-12 13:59:53 -07:00
Stephen Hines
162a817521 Merge "More Clang tweaks to the build system." 2012-04-11 23:35:03 -07:00
Andreas Huber
19b2be5f8d Merge "Revert "ARM: compile everything with relro / bind_now."" 2012-04-10 14:54:38 -07:00
Nick Kralevich
b3789be766 Revert "ARM: compile everything with relro / bind_now."
This reverts commit 020e4919e8.
2012-04-10 13:13:29 -07:00
Raphael Moll
b3700ab773 Merge "SDK: Also read sdk/build/tools.OS.atree"
This allows us to have per-host OS (or OS + arch) atree files in case we
need to get tools which source varies per host OS, example:
- sdk/build/tools.linux.atree
- sdk/build/tools.linux-x86_64.atree
- sdk/build/tools.windows.atree
etc.

(cherry picked from commit 3ab307a68c)

Change-Id: I05140bb02ecd41152e47ecdf404b1b8fb34fdf24
2012-04-10 12:21:46 -07:00
Ying Wang
4534d8135a Merge the NOTICE files when doing pdk fusion build.
Bug: 6297249
Change-Id: I693ab15e5a2eacda3c8b9d2ce36469ea177ae178
2012-04-10 10:02:02 -07:00
Jean-Baptiste Queru
64cd96ce7f Bump DX Java heap to 2GB.
Change-Id: I240a24f9bb8511fea8f420f76b4541018ae79a0c
2012-04-10 08:21:21 -07:00
Evgeniy Stepanov
f50f4c5299 More Clang tweaks to the build system.
Adds arm_neon.h to the include path when building with Clang.
Filters out 3 additional compiler flags when building with Clang.
Filters out unsupported flags from TARGET_(arm|thumb)_CFLAGS, as well.

Change-Id: I5e23a95356e0b10c31c9aa3cb4905f6a674709e4
2012-04-10 16:33:37 +04:00
Kenny Root
883a122808 Merge "resolved conflicts for merge of a86fcc29 to master" 2012-04-09 15:12:58 -07:00
Kenny Root
f32dc71e49 resolved conflicts for merge of a86fcc29 to master
Change-Id: I3868c19bfd309b5b43b5642152a120931fe37315
2012-04-09 14:59:04 -07:00
Ying Wang
4394aaef7e Merge "Build system support to export include paths" 2012-04-09 12:43:09 -07:00
Nick Kralevich
1747c60790 Merge "ARM: compile everything with relro / bind_now." 2012-04-09 12:30:12 -07:00
Ying Wang
c4625abc5d Fix deps for notice generation.
With "foo bar : req", the build command will be run separately for foo
and bar.
Instead with "foo : bar" and "bar : req", the build command will be run
only once to produce both targets.
Also running the same build command concurrently may lead to build race
condition.

Change-Id: I8af2817546a7e2697a553c9320bd10f6bd4f20a2
2012-04-09 12:16:23 -07:00
Nick Kralevich
020e4919e8 ARM: compile everything with relro / bind_now.
Enable relro / bind_now when compiling Android applications.
This marks certain regions of memory as read-only after linking,
making memory corruption security vulnerabilities are harder
to exploit.

See:
 * http://www.akkadia.org/drepper/nonselsec.pdf (section 6)
 * http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html

Stop using the custom linker script, which inhibits
relro / bind_now support.

Change-Id: Iaebfbbb492299004f9da92b649985b6cd67d8c97
2012-04-09 12:04:32 -07:00
Nick Sanders
135c3af45a am df49771a: Allow factory specific kernel commandline
* commit 'df49771a4a82a147e287190f872ab9d0e237a69f':
  Allow factory specific kernel commandline
2012-04-06 14:11:10 -07:00
Stephen Smalley
56882bf9b4 Support the setting of file security contexts in OTA and update packages.
Pass the file_contexts configuration to the releasetools scripts
so that the security contexts of files can be properly set for OTA
and update packages.

Requires Ica5fb73d6f2ffb981b74d1896538988dbc4d9b24

Change-Id: I5a63fd61a7e74d386d0803946d06bcf2fa8a857e
2012-04-06 15:35:41 -04:00
Stephen Smalley
5042392262 Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.
This configuration is used to determine the file security contexts
to set on the files in the yaffs2 or ext4 image that is generated.
This is similar to the android_filesystem_config.h tables for determining
the UID/GID/mode, but as a configuration rather than code.

Change-Id: I7c6f59fe7cb8bc4c86c8790f991b12dd93a61f68
2012-04-06 15:34:37 -04:00
Nick Sanders
df49771a4a Allow factory specific kernel commandline
* BOARD_KERNEL_CMDLINE_FACTORY_BOOT can be set to
add kernel commandline items to the factory ramdisk,
such as fiq_debugger.console_enable=Y

Change-Id: Iee4060b96eaeecc517975c56342fd5445b1feabf
Signed-off-by: Nick Sanders <nsanders@google.com>
2012-04-05 19:55:51 -07:00
Eino-Ville Talvala
11d3c4421f Add new camera system include path to pathmap.
Change-Id: Ia4200dbffa90397a8a48d00139647c45646af734
2012-04-05 17:09:18 -07:00
Stephen Hines
eebcef64ec Merge "Add support for building with AddressSanitizer." 2012-04-04 08:02:49 -07:00
Stephen Hines
7b29683411 Merge "Include Clang headers from ".../include" directory." 2012-04-04 08:02:43 -07:00
Tor Norbye
5957e33835 Merge "Revert "Update versions of the Eclipse prebuilt libraries"" 2012-04-03 12:42:28 -07:00
Tor Norbye
8245810475 Revert "Update versions of the Eclipse prebuilt libraries"
This reverts commit 94c85043c1.
2012-04-03 11:14:16 -07:00
Ying Wang
8c8a60e98a Merge "Support to run DroidDoc in unbundled builds." 2012-04-03 09:27:28 -07:00
Tor Norbye
bcfa78b60a Merge "Update versions of the Eclipse prebuilt libraries" 2012-04-03 07:56:32 -07:00
Evgeniy Stepanov
6cc9c06854 Add support for building with AddressSanitizer.
Change-Id: I559d21bbeb9f869f51e48ce18247ceaf766768b4
2012-04-03 14:59:01 +04:00
Evgeniy Stepanov
a7095e9192 Include Clang headers from ".../include" directory.
Do it with -isystem instead of -I.

Change-Id: I70fd55772e59a35f0b5a56816d61120f4921f4a4
2012-04-03 14:58:57 +04:00
Ying Wang
3f45b3c35c Support to run DroidDoc in unbundled builds.
Change-Id: Ia5ace10ed75c451e346e289f0c534ad619abdb65
2012-04-02 18:32:05 -07:00
Narayan Kamath
2109487a29 Changes to C++ protocol buffer compilation.
Generate C++ code for all .proto files before attempting
to compile them. This takes care of the case where generated
.pb.cc files include other header / c++ files due to proto
imports in the original .proto files.

Change-Id: I26513842618fd31f0b33a3f10df2a5e556094515
2012-04-02 18:39:31 +01:00
Ying Wang
406f69c8d6 Merge "Support to build pdk and pdk fusion." 2012-04-02 09:17:56 -07:00
Ying Wang
d222192fb0 Merge "Generate platfrom.zip for build goal "platform"." 2012-04-02 09:11:47 -07:00
Colin Cross
0cae3313e2 Merge "Remove base_intermediates from LOCAL_C_INCLUDES" 2012-04-01 17:54:04 -07:00
Colin Cross
9ad36ef929 Remove base_intermediates from LOCAL_C_INCLUDES
base_intermediates is not used anywhere in the main build system,
and should not be part of LOCAL_C_INCLUDES.  It is used by
external/webkit/Android.mk as a local variable, which causes
the libwebcore_intermediates directory to be added to the include
path for every module.

Change-Id: Iddeee880add4b6f694a15d1900c588e1c547b9df
2012-03-30 19:32:37 -07:00
Ying Wang
82b836fda6 Support to build pdk and pdk fusion.
Bug: 6241618
Change-Id: I08f74019631e9e132c15cdb2916bbafb052f9aa6
2012-03-30 18:57:52 -07:00
Daniel Berlin
ee406f1cbe Merge "Moving notice file generation to a python script (it was getting fairly complicated in bash), update HTML output to have a table of contents, and fix typos/bugs in notice file CSS" 2012-03-30 16:48:50 -07:00
Ying Wang
4c289e5041 Generate platfrom.zip for build goal "platform".
Bug: 6241618
If platform appears on the build command line, build platform.zip,
which essentially is the zip package of the system directory.
Put the platform.zip to the dist dir if "dist" is specified too,
so the platform.zip can be downloaded from the build page.

Change-Id: I988dd5c753a4ee744b4e3dccf261d8df904d9847
2012-03-30 13:56:35 -07:00
Daniel Berlin
f5a97d7fbb Moving notice file generation to a python script
(it was getting fairly complicated in bash),
update HTML output to have a table of contents,
and fix typos/bugs in notice file CSS

Change-Id: I51131f594e3bbe63f03165fa42f5ceeaec518543
2012-03-30 15:08:59 -04:00
Dima Zavin
06e758a966 config: add documentation for managing kernel-headers
Change-Id: I6dc6ede4703cbe88c356656a1a6b86a4ffaafa3b
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-30 10:46:28 -07:00
Dima Zavin
8e4042cc79 Revert "core: the device/board/product kernel headers will be auto-generated"
This reverts commit 992a52990c.

Change-Id: I9919f13705509a793f856da8ef7207b3feb47092
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-30 10:46:28 -07:00
Jing Yu
f5172c7564 Switch default gcc toolchain from 4.4.3 to 4.6.
Switch both arm-linux-androideabi toolchainand arm-eabi toolchain.

Change-Id: I7b2771fe684853ab37e3b5b7cfe4146f9f901e02
2012-03-29 20:45:50 -07:00
Colin Cross
971c246cb5 Remove some dist targets from PDK builds
Remove apps.zip and package_stats.txt from the PDK build, they
fail because no apps or jar files are built.

Remove emulator.zip, the emulator is not built.

Also, put recovery.img back into the PDK build, it is needed by
the img.zip target, and will be necessary for fusion builds.

Change-Id: Ie314e0432881d3ee4f1ef3eec5a98be6b8581572
2012-03-29 14:31:08 -07:00
Alex Sakhartchouk
ed6d9db2cd Merge "Moving libRS" 2012-03-28 15:09:01 -07:00
Alex Sakhartchouk
0b7d3d69bc Moving libRS
Change-Id: I45058b3e1cc213db6e322090f86dd19a6747fc4c
2012-03-28 14:22:55 -07:00
Colin Cross
bbd4998216 Add samsung_arm as an owner
Add samsung_arm as an owner to be used on files that depend
on licenses from both Samsung and ARM.

Change-Id: I03a5ba739b940915519f75477adea7c2a9b0a563
2012-03-28 09:34:28 -07:00
Colin Cross
b683895db8 Merge "telephony: remove default apns_conf.xml" 2012-03-28 09:34:16 -07:00
Kenny Root
89912bec23 Merge "Move keystore from user_tags to core req" 2012-03-27 20:41:57 -07:00
Raphael Moll
b6addfb250 am a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin 1.7"
* commit 'a8dd58a8a604ed90c5fd5fb632eb2bb8b1ff8fa0':
  Allow make 3.82 to be used under Cygwin 1.7
2012-03-27 17:53:32 -07:00
Raphael Moll
2696eb6d11 am 3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
* commit '3b1ebe7dc291175886f21ffbbccdb98b560efabf':
  SDK atree: support HOST_OUT location.
2012-03-27 17:53:32 -07:00
Dima Zavin
8f4c3116b2 telephony: remove default apns_conf.xml
Remove the hack from main.mk to filter through installed files
to look for an apns file.

Change-Id: I31ba69bfc8323fea0a38154922df6b57a0f227c8
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-27 17:30:26 -07:00