Commit Graph

2254 Commits

Author SHA1 Message Date
Colin Cross 4049130cba build: remove unused ota tools
genext2fs, tune2fs, and e2fsck are no longer used by mkuserimg.sh.

Change-Id: If3e9e846e021de0973bde2702e60acdc9f4c57c7
2012-04-19 13:29:27 -07:00
Keun young Park 0da5e0ba36 Merge "enable recovery img build for PDK" 2012-04-19 10:25:20 -07:00
Keun young Park 782610165f enable recovery img build for PDK
Bug: 6363041
Change-Id: I25dff887dd0946c9506926e66e0514390c20692e
2012-04-19 09:55:24 -07:00
Colin Cross 21adee0184 Move pdk fusion platform.zip file under vendor/pdk
Look for the platform.zip file in:
vendor/pdk/DEVICE/PRODUCT-BUILD_VARIANT/platform/platform.zip

Change-Id: I275029842fdf13867d5141549ca8c39abb23600b
2012-04-19 00:50:00 -07:00
Ying Wang 616e596385 Write out export_includes whenever the module is built.
Bug: 6362268
Change-Id: If872cf8fe597a02e6ca740a181cea85f486df98e
2012-04-18 17:35:55 -07:00
Ying Wang c32af65886 Revert "Write out export_includes whenever the module is built."
This reverts commit 40c34f3778
2012-04-18 16:55:07 -07:00
Ying Wang 40c34f3778 Write out export_includes whenever the module is built.
Bug: 6362268
Change-Id: Ic5d028c108423c694736a06c05ec13093d42f1b8
2012-04-18 16:30:17 -07:00
Jean-Baptiste Queru dbff3f5b77 Whitelist widevine
Change-Id: I4863b335ebc02d642874a4dd3dd9a8af93455d7b
2012-04-13 13:37:56 -07:00
Kevin Hester db8698be85 am 6c703628: Allow packages to place manifest files in any directory
* commit '6c703628c54275797caf2b524686d3dd2e34385c':
  Allow packages to place manifest files in any directory
2012-04-13 07:53:58 -07:00
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
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
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
Marius Renn e455a972be Merge "Multi-Project Commit: Move of filterfw out of system/media (3 of 7)" 2012-03-27 16:29:47 -07:00
Raphael Moll 4c45699015 Allow make 3.82 to be used under Cygwin 1.7
(Manual merge of 76bf62d75e)

Change-Id: I61a6b10b4d81192dbff928780c2263931cf57c4d
2012-03-27 14:35:34 -07:00
Raphael Moll 3b1ebe7dc2 Merge "SDK atree: support HOST_OUT location." 2012-03-27 11:40:47 -07:00
Marius Renn fe97fe9e9f Multi-Project Commit: Move of filterfw out of system/media (3 of 7)
This is part of the multi-project commit to move the filter-framework
from system/media/mca to frameworks/base/media/mca.

Note that the filter-framework will soon be replaced with a refactored
version currently under API review (also to go under frameworks/base).
This move is done now to unblock the PDK efforts.

Change-Id: I3d12882239e0bb66e11d3fb5ec952cc474be4f0a
2012-03-27 10:46:13 -07:00
Jean-Baptiste Queru d17c89776e am 0b6a436f: Merge "Fix build"
* commit '0b6a436f09f10e358c64ee977c8322b3a76fd977':
  Fix build
2012-03-27 08:07:09 -07:00
Glenn Kasten f396f56817 Fix build
Change-Id: I740b211588122b1198d7925c78e9a4a7aaf08784
2012-03-27 07:24:24 -07:00
Glenn Kasten bf6b3be4ea Merge "mv wilhelm" 2012-03-26 17:54:22 -07:00
Glenn Kasten d905491b09 mv wilhelm
Change-Id: I3c1573a3dcb0567cf330fe06b3ae70b3b8f66978
2012-03-26 17:50:44 -07:00
Evgeniy Stepanov 55daae9688 Skip host system directories in Clang include path.
This change removes /usr/include and /usr/local/include from Clang header
search path.

Change-Id: I84450f4f4aef829c5aef9221bf300e69819bac48
2012-03-26 14:22:07 +04:00
James Dong 98f7c37601 Merge "Added /frameworks/av/include to the default include search path" 2012-03-25 16:40:57 -07:00
James Dong c49ee7139f Added /frameworks/av/include to the default include search path
o related-to-bug: 6214141

Change-Id: I90de0563298fd9146ac823926426d1cffd815c2d
2012-03-23 18:47:56 -07:00
Brian Swetland ee7cd7ea25 Merge "Introduce TARGET_BUILD_PDK for selecting build tweaks for the PDK" 2012-03-23 18:26:31 -07:00
Brian Swetland 7a5960555b Introduce TARGET_BUILD_PDK for selecting build tweaks for the PDK
BUILD_PDK and some of the other infrastructure will go away once
we're done with the new new PDK work, but for now don't disturb
that stuff.

Change-Id: Ia39bf759ec03f203858ddcc4880af72bd132cb5a
2012-03-23 16:04:13 -07:00
Mathias Agopian ee6bddc308 move ndk headers to frameworks/native
Change-Id: Ie92ca68bb9f99b2d5a1dbdfc9e57f3f986265386
2012-03-23 14:23:41 -07:00
Nick Sanders 8f8f0d494e Add build.prop to factory ramdisk
We'll need a special case to set device properties on the factory ramdisk

Change-Id: I146d5c503e8c97005caa1ab1dbaca7ee9ab30faf
Signed-off-by: Nick Sanders <nsanders@google.com>
2012-03-23 10:51:32 -07:00
Stephen Hines 62304f1ec3 Make sure compiler flags also pick up correct toolchain.
Change-Id: Id6ff8c3ee7cfa5dee46ef000cbceb7666b934240
2012-03-22 21:26:17 -07:00
Ying Wang dfbe79b803 Don't expose the compiler dependency.
Change-Id: Ia472eaab3e8e883a32e8b441a2480562db278e45
2012-03-22 11:26:22 -07:00
Andrew Hsieh 5d9aedef30 am 2245d17d: Point to new linux prebuilt toolchain for SDK build
* commit '2245d17dc847ecb5371807466788552ca0198152':
  Point to new linux prebuilt toolchain for SDK build
2012-03-22 11:03:14 -07:00
Andrew Hsieh 2245d17dc8 Point to new linux prebuilt toolchain for SDK build
Change-Id: I21849119b0f3f45f950e9e6d1da0833aff381fb7
2012-03-22 09:55:36 -07:00
Evgeniy Stepanov b71e2df30a Add LOCAL_CLANG variable to switch C/C++ build environment to Clang.
Change-Id: I8ca1c24f51aa5546ac9618d31566a52e4fdb1436

Conflicts:

	core/clear_vars.mk
2012-03-22 07:31:27 -07:00
Stephen Hines 0e4c317c92 Merge "Define a basic llvm-link + clang environment" 2012-03-22 07:28:41 -07:00
Raphael Moll 74160ed4c4 SDK atree: support HOST_OUT location.
Change-Id: Ib369280971b37a3eb35ac94991cdbc49dead903e
2012-03-21 22:34:48 -07:00
Mike Lockwood 1c06bc778c Merge commit '7d2ba7c' 2012-03-21 17:08:21 -07:00
Mike Lockwood e8eb8df989 Merge commit 'c6e952f'
Don't build userdata.img for tests build.

Change-Id: I492cca5e5989cabdeb6f75c3b8a8c9ac3b9ca8c8
2012-03-21 17:01:18 -07:00
Steve Block 34268ebd69 Merge "Add a comment about publishing licenses for third-party code" 2012-03-21 10:17:46 -07:00
Steve Block d14d3b4e64 Add a comment about publishing licenses for third-party code
Change-Id: I21bee0bb78ab42b4f7b6a938f94653c7e21e8503
2012-03-21 17:05:11 +00:00
Doug Zongker 2c4dc95767 Merge "optional cross-check between OTA radio images and board-info.txt" 2012-03-21 09:47:25 -07:00
Doug Zongker 9296f09277 optional cross-check between OTA radio images and board-info.txt
Adds a python script which checks the version of each radio image
added with the new add-radio-file-checked macro against a file
containing sha-1 -> version string mappings and the contents of
board-info.txt, so that the build can fail if board-info.txt and the
OTA images are out of sync.

Change-Id: Icb61dc2adefc240ced9059941582c23b629089c0
2012-03-21 09:18:15 -07:00
Ying Wang d4a41953fe am 0187511e: am 4243532d: am 301843ae: am 29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '0187511e70960618ac5c84f1446ec955ba6c8955':
  Fix for "dexopt: No such file or directory" error
2012-03-20 19:36:30 -07:00
Ying Wang 301843ae3e am 29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '29e44b7a8300644516b021e9e324ffe426098b3f':
  Fix for "dexopt: No such file or directory" error
2012-03-20 15:20:14 -07:00
Tor Norbye 94c85043c1 Update versions of the Eclipse prebuilt libraries
Change-Id: I0bfaf13147e135f29f8a1b7862429320d0e6a2c7
2012-03-20 12:24:47 -07:00
Ying Wang 29e44b7a83 Merge "Fix for "dexopt: No such file or directory" error" 2012-03-20 11:05:56 -07:00
yroussel 1319005a2a Define a basic llvm-link + clang environment
Move it from dalvik/vm/translator/runtime/ to build/
Add handling of -march=armv5te and -march=armv5e
2012-03-20 17:39:29 +04:00
Dima Zavin 992a52990c core: the device/board/product kernel headers will be auto-generated
So, just add the output include directory to the include path

Change-Id: Ia370454237913a748288124f65a6b731b17d6e1a
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-19 12:32:08 -07:00
Dima Zavin f926990ba3 core: allow product to provide kernel headers as well
This is useful when a device inherits from an architecture
product, such as omap4.mk. The architecture specific product
can provide kernel headers to all the devices that use
that architecture.

Change-Id: I0c9d3120a6089fb535a3fa8eccf10775a271cd21
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-19 12:32:08 -07:00
Keun young Park 59c2136e1b Merge "rename pdk builds: pdk1 to pdk_eng, pdk2 to pdk_rel" 2012-03-16 12:35:40 -07:00
Dima Zavin 4e16f96dbd core: allow devices to provide their own device specific kernel headers
Currently, we need to pollute the common bionic/libc/kernel/...
directory with device specific kernel headers. This has created a giant
dumping ground of headers from all the projects we have ever done.

Allow each device to provide their own headers and thus eventually allow
bionic/libc/kernel to become *just* the common linux kernel headers.

This change will automatically add device/oem/name/kernel-headers to
the include list and also allow the BoardConfig.mk to specify
additional directories with TARGET_BOARD_KERNEL_HEADERS variable.
The requirement is that the final dir name must be kernel-headers to
mark explicitly where kernel headers are kept.

Change-Id: I7d32a979eef1f464db06c1bc448a04ddc3575efd
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-15 13:22:48 -07:00
Keun young Park 9ec15ec89c rename pdk builds: pdk1 to pdk_eng, pdk2 to pdk_rel
Change-Id: Iadf0493b1f6700638010ceb50ced2fe7bc8bb603
2012-03-15 12:23:05 -07:00
Kenny Root 9ea6952e8a Move keystore from user_tags to core req
Move the keystore from the grandfathered list to the new core required
packages.

Change-Id: I61343129c3111cab2d6a1d536775ed9764085281
2012-03-15 09:47:07 -07:00
Glenn Kasten a00ba58646 Merge "Use pathmap.mk for system/media includes" 2012-03-14 16:42:17 -07:00
Glenn Kasten fefc17ff59 Use pathmap.mk for system/media includes
Currently these point to the old location.
Another CL will move them to the new location.

Change-Id: I61dd732981a9a7a3f4a2c1cc01dc072f4fb6a2b8
2012-03-14 15:30:37 -07:00
Ying Wang bf69aa32c9 Fix tests build.
Use the conditional only after the tests build variant is phased out.

Change-Id: Ide691700dda4bbf56c6f81f923d1b8c5eb196b85
2012-03-13 19:49:59 -07:00
Ying Wang 30e8093f5f Merge "Add build goal "tests"." 2012-03-13 19:13:19 -07:00