summaryrefslogtreecommitdiffstats
path: root/content/content.gyp
Commit message (Collapse)AuthorAgeFilesLines
* Android: rename android_build_type gyp variable.torne@chromium.org2013-03-121-2/+1
| | | | | | | | | | | | | Rename the "android_build_type" gyp variable to "android_webview_build" to better describe what it does. There are still references in WebKit and V8 that need to be changed before the original variable can be removed. BUG=184431 Review URL: https://codereview.chromium.org/12730006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187556 0039d316-1c4b-4281-b951-d872f2087c98
* [Android] Change jni_gen_dir to jni_gen_package for jni_generator.yfriedman@chromium.org2013-03-071-3/+3
| | | | | | | | | | | | | With the old name it was getting relativized which is undesirable. See bug for more details. BUG=159133 TBR=ben (nobody really cares about this outside of build/ which cjhopman approved) Review URL: https://chromiumcodereview.appspot.com/12558005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186803 0039d316-1c4b-4281-b951-d872f2087c98
* Handle LibraryLoader error from the renderer process.yfriedman@chromium.org2013-03-071-0/+13
| | | | | | | | | | | | | | | | | If we fail to load the library in the renderer process, just abort early. This prevents an extra user-visible dialog that Chrome has crashed. Note that we currently assume the browser process hits the same error and will prompt the user. If this only happens for the renderer process we'd end up with a hung tab, but it's not clear how that would happen. As part of this, convert the RESULT_CODES enum to be generated from a template so that we can re-use the same values for C++ and Java BUG=180054 Review URL: https://chromiumcodereview.appspot.com/12464004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186610 0039d316-1c4b-4281-b951-d872f2087c98
* Generate Java template enums into correct Java package hierarchynewt@chromium.org2013-03-021-1/+1
| | | | | | | | | | | | | | The moves NetError.java (generated from NetError.template) from out/Debug/gen/templates/org.chromium.net/NetError.java to out/Debug/gen/templates/org/chromium/net/NetError.java This is intended to help IDEs find the generated files. Review URL: https://chromiumcodereview.appspot.com/12374036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185702 0039d316-1c4b-4281-b951-d872f2087c98
* Use _target_name instead of package_name for java*.gypicjhopman@chromium.org2013-02-201-2/+0
| | | | | | | | | | | | | | | We were using package_name as a unique name for naming output files and directories. package_name was typically the same as _target_name or a variation of it (like dropping _apk). Using _target_name instead means we need to specify one less thing and it is (maybe?) guaranteed to be unique. TBR=brettw,joi,jar,fischman,zea,sky BUG= Review URL: https://chromiumcodereview.appspot.com/11308030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183639 0039d316-1c4b-4281-b951-d872f2087c98
* Make content static and release builds work on Win64 jschuh@chromium.org2013-02-131-0/+8
| | | | | | | | | | | | Just c4267 build suppressions. BUG=166496 BUG=167187 TBR=jam@chromium.org R=jam@chromium.org Review URL: https://codereview.chromium.org/12254004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182224 0039d316-1c4b-4281-b951-d872f2087c98
* Enable BIGOBJ in MSVC for content targetjschuh@chromium.org2013-02-031-0/+9
| | | | | | | | | | | | | Under Win64 builds content exceeds the obj section limit. Eventually we need to enable this in common.gypi, but we need to fix some targets to make them compatible first. BUG=166496, 173851 TBR=jam Review URL: https://chromiumcodereview.appspot.com/12191002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180318 0039d316-1c4b-4281-b951-d872f2087c98
* Relanding "Add apk for running content_browsertests"nileshagrawal@chromium.org2013-01-291-0/+1
| | | | | | | | | | | | | | | | | | Revert "Revert 179189" This reverts commit 5844ab0c6a41cc9d306f8c355cc7ceb5e290cbb1. Original CL:https://codereview.chromium.org/12047068/ was reverted as we failed to update the bot scripts with the new package name for content_shell_apk TBR=mark@chromium.org,jam@chromium.org BUG=138275 Review URL: https://chromiumcodereview.appspot.com/12091033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179428 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 179189nileshagrawal@chromium.org2013-01-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Failed to rename package name in buildbot scripts. Broke buildbots. > Add apk for running content_browsertests > > Split off org.chromium.content_shell into: > org.chromium.content_shell - content shell java code, builds a jar, directory structure similar to other jar targets > org.chromium.content_shell_apk - application code to build content_shell_apk, directory structure similar to that of android application > org.chromium.content_browsertests_apk - application code to build content_browsertests_apk > > Also splitting content/shell/android/res into: > - content/shell/android/java/res > - content/shell/android/shell_apk/res > > Both content_shell_apk and content_browsertests_apk will depend on content_shell_java target to include java/res needed to show a shell based browser. > > I will do another CL to move The java files for content_shell_tests_apk to content_shell_apk package. > > BUG=138275 > > > Review URL: https://chromiumcodereview.appspot.com/12047068 TBR=nileshagrawal@chromium.org Review URL: https://codereview.chromium.org/12088031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179211 0039d316-1c4b-4281-b951-d872f2087c98
* Add apk for running content_browsertestsnileshagrawal@chromium.org2013-01-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | Split off org.chromium.content_shell into: org.chromium.content_shell - content shell java code, builds a jar, directory structure similar to other jar targets org.chromium.content_shell_apk - application code to build content_shell_apk, directory structure similar to that of android application org.chromium.content_browsertests_apk - application code to build content_browsertests_apk Also splitting content/shell/android/res into: - content/shell/android/java/res - content/shell/android/shell_apk/res Both content_shell_apk and content_browsertests_apk will depend on content_shell_java target to include java/res needed to show a shell based browser. I will do another CL to move The java files for content_shell_tests_apk to content_shell_apk package. BUG=138275 Review URL: https://chromiumcodereview.appspot.com/12047068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179189 0039d316-1c4b-4281-b951-d872f2087c98
* Move content/components/navigation_interception to src/componentskaiwang@chromium.org2013-01-231-1/+0
| | | | | | | | BUG=169312 Review URL: https://chromiumcodereview.appspot.com/11830043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178238 0039d316-1c4b-4281-b951-d872f2087c98
* [Android] Manage CVC's retained JS object set on the native side.benm@chromium.org2013-01-211-0/+12
| | | | | | | | | | | | | | | Move management of the js retained object set to the native java bridge. BUG=169228 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=177765 Reverted in https://chromiumcodereview.appspot.com/11817047 Review URL: https://chromiumcodereview.appspot.com/11817047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177948 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed issue that the change of header file didn't rebuild the template file.michaelbai@chromium.org2013-01-191-1/+1
| | | | | | | | | | | | Previous one didn't work because only change files whose extension is same as rule's extension will make the target rebuild. BUG=170995 TBR=jam,agl Review URL: https://chromiumcodereview.appspot.com/11929032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177825 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 177765scottmg@chromium.org2013-01-181-12/+0
| | | | | | | | | | | | | | | | | | | | | Failed compile on all Linux bots. > [Android] Manage CVC's retained JS object set on the native side. > > Move management of the js retained object set to the native java > bridge. > > Android only change, android bots green. > NOTRY=true > BUG=169228 > > > Review URL: https://chromiumcodereview.appspot.com/11817047 TBR=benm@chromium.org Review URL: https://codereview.chromium.org/12018025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177770 0039d316-1c4b-4281-b951-d872f2087c98
* [Android] Manage CVC's retained JS object set on the native side.benm@chromium.org2013-01-181-0/+12
| | | | | | | | | | | | | | Move management of the js retained object set to the native java bridge. Android only change, android bots green. NOTRY=true BUG=169228 Review URL: https://chromiumcodereview.appspot.com/11817047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177765 0039d316-1c4b-4281-b951-d872f2087c98
* Re-land "[Android] Generate localized strings.xml files at build time."newt@chromium.org2013-01-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This generates localized strings.xml files (e.g. values-fr/strings.xml) from grd and xtb files at build time. This means we no longer need to check in localized strings.xml files. Note: the xtb files are empty until translations are available. Benefits: - 41 fewer extraneous results when grepping Java string IDs - Switching from maintaining strings in strings.xml over to using a grd file is One Trivial CL* away: just include English in the list of languages for which we generate strings.xml files. *Restrictions may apply Originally landed as https://codereview.chromium.org/11659006/ This can be re-landed as of https://codereview.chromium.org/11880050/ BUG=167248 TBR=yfriedman@chromium.org,thakis,jam@chromium.org,cjhopman,shashishekhar@chromium.org Review URL: https://codereview.chromium.org/11967005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177170 0039d316-1c4b-4281-b951-d872f2087c98
* Add content_renderer and content_gpu to the dependency list of content_browserkaiwang@chromium.org2013-01-161-1/+10
| | | | | | | | | BUG=170190 Review URL: https://chromiumcodereview.appspot.com/11948003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177113 0039d316-1c4b-4281-b951-d872f2087c98
* Android: Fix compile errors in content_browsertestsnileshagrawal@chromium.org2013-01-151-0/+5
| | | | | | | | | | | | | Also adding include_dirs as a direct_dependent_setting on the jni_headers targets in content. This makes depending on these targets easier. BUG=138275 Review URL: https://chromiumcodereview.appspot.com/11882011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176845 0039d316-1c4b-4281-b951-d872f2087c98
* Move content/components/web_contents_delegate_android to ↵boliu@chromium.org2013-01-121-1/+0
| | | | | | | | | | | | | components/web_contents_delegate_android Moving files, change namespace from content to components, added/updated DEPS files, and fix builds BUG=169312 Review URL: https://chromiumcodereview.appspot.com/11823046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176598 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 176134newt@chromium.org2013-01-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | > [Android] Generate localized strings.xml files at build time. > > This generates localized strings.xml files (e.g. > values-fr/strings.xml) from grd and xtb files at build time. This > means we no longer need to check in localized strings.xml files. Note: > the xtb files are empty until translations are available. > > Benefits: > - 41 fewer extraneous results when grepping Java string IDs > - Switching from maintaining strings in strings.xml over to using a > grd file is One Trivial CL* away: just include English in the list > of languages for which we generate strings.xml files. > > *Restrictions may apply > > BUG=167248 > > Review URL: https://codereview.chromium.org/11659006 TBR=newt@chromium.org Review URL: https://codereview.chromium.org/11820058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176151 0039d316-1c4b-4281-b951-d872f2087c98
* [Android] Generate localized strings.xml files at build time.newt@chromium.org2013-01-101-0/+1
| | | | | | | | | | | | | | | | | | | | | This generates localized strings.xml files (e.g. values-fr/strings.xml) from grd and xtb files at build time. This means we no longer need to check in localized strings.xml files. Note: the xtb files are empty until translations are available. Benefits: - 41 fewer extraneous results when grepping Java string IDs - Switching from maintaining strings in strings.xml over to using a grd file is One Trivial CL* away: just include English in the list of languages for which we generate strings.xml files. *Restrictions may apply BUG=167248 Review URL: https://codereview.chromium.org/11659006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176134 0039d316-1c4b-4281-b951-d872f2087c98
* Fix downstream android webview build from r175537boliu@chromium.org2013-01-081-1/+1
| | | | | | | | | | | | | | | guava and jsr305 libraries are already present in the downstream build, just need to not use the upstream third_party version and modify the build script BUG= TBR=torne@chromium.org Android only build fix. Ran through android bots with compile step. NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11822002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175600 0039d316-1c4b-4281-b951-d872f2087c98
* Add VisibleForTesting to content/public/androidaruslan@chromium.org2013-01-081-0/+1
| | | | | | | | | BUG=168615 Review URL: https://chromiumcodereview.appspot.com/11784028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175537 0039d316-1c4b-4281-b951-d872f2087c98
* Generate PageTransitionTypes.java for Androidboliu@chromium.org2012-12-161-0/+13
| | | | | | | | BUG= Review URL: https://codereview.chromium.org/11577016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173372 0039d316-1c4b-4281-b951-d872f2087c98
* Remove webview gyp time dependency on third_party/eyesfreeboliu@chromium.org2012-12-141-1/+7
| | | | | | | | | | | | | Android only gyp fix for webview. All trybots already passed compile step. TBR=jam@chromium.org NOTRY=true BUG= Review URL: https://chromiumcodereview.appspot.com/11576034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173188 0039d316-1c4b-4281-b951-d872f2087c98
* Initial braille supportdtrainor@chromium.org2012-12-141-0/+1
| | | | | | | | | | | Connect third_party/eyesfree code to Chrome, allowing accessibility to interact with a braille keyboard. BUG= Review URL: https://chromiumcodereview.appspot.com/11365055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173099 0039d316-1c4b-4281-b951-d872f2087c98
* Support Java resources within content.newt@chromium.org2012-11-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides support for android-style resource folders in content and other non-apk Java targets. The AppResource hack can then be removed shortly. Details: while building a non-apk target (e.g. chromium_content.jar), we generate an R.java file with non-final constants and in the appropriate Java package (e.g. org.chromium.content.R) using the resources in the target (e.g. content/public/android/java/res). This R.java is used to produce the jar, but is not included in the jar itself. When we later build an apk, we merge the resources from the apk (e.g. org/chromium/content_shell/res) with the resources from the non-apk targets it depends on (e.g. content/public/android/java/res). A new R.java is generated using the merged resources with the correct mapping from resources to integer IDs. This R.java file is copied into each needed package (e.g. org.chromium.content.R and org.chromium.content_shell.R) and included in the apk. This is the first of three CLs to replace AppResource with R: 1. http://codereview.chromium.org/11363150 - Support Java resources within content 2. http://codereview.chromium.org/11360207 - Add Java resources to content and chrome 3. http://codereview.chromium.org/11377117 - Remove AppResource and unneeded resources BUG=136704 Review URL: https://codereview.chromium.org/11363150 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168283 0039d316-1c4b-4281-b951-d872f2087c98
* Move WebContentsDelegateAndroid to content/componentsjknotten@chromium.org2012-11-141-0/+1
| | | | | | | | | | | | | | | | | | | | | 1. Move chrome/browser/component/web_contents_delegate_android to content/components/web_contents_delegate_android. 2. Rename package org.chromium.chrome.browser.component. web_contents_delegate_android to org.chromium.content.components. web_contents_delegate_android. 3. Remove shouldOverrideUrlLoading from WebContentsDelegateAndroid interface, which is no longer required. I will follow up with a second change to completely remove chrome/browser/component/web_contents_delegate_android once external dependencies on it have been removed. BUG=157575 Review URL: https://chromiumcodereview.appspot.com/11365199 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167670 0039d316-1c4b-4281-b951-d872f2087c98
* Move navigation interception component to content/componentsjknotten@chromium.org2012-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | 1. Move C++ source from chrome/browser/component/navigation_interception to content/components/navigation_interception. 2. Change the namespace from navigation_interception:: to content:: 3. Change Java package from org.chromium.chrome.browser.components. navigation_interception to org.chromium.content.components. navigation_interception. I will follow up with another patch to completely remove chrome/browser/component/navigation_interception once external dependencies have been updated to use the component at its new component BUG=157575 Review URL: https://chromiumcodereview.appspot.com/11293017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166883 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 166758 - Move navigation interception component to content/componentsraymes@chromium.org2012-11-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Broke the build at http://build.chromium.org/p/chromium.linux/builders/Android%20Builder%20%28dbg%29/builds/20261 Original commit message follows: 1. Move C++ source from chrome/browser/component/navigation_interception to content/components/navigation_interception. 2. Change the namespace from navigation_interception:: to content:: 3. Change Java package from org.chromium.chrome.browser.components. navigation_interception to org.chromium.content.components. navigation_interception. I will follow up with another patch to completely remove chrome/browser/component/navigation_interception once external dependencies have been updated to use the component at its new component BUG=157575 Review URL: https://chromiumcodereview.appspot.com/11293017 TBR=jknotten@chromium.org Review URL: https://codereview.chromium.org/11361177 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166764 0039d316-1c4b-4281-b951-d872f2087c98
* Move navigation interception component to content/componentsjknotten@chromium.org2012-11-081-0/+1
| | | | | | | | | | | | | | | | | | | | | 1. Move C++ source from chrome/browser/component/navigation_interception to content/components/navigation_interception. 2. Change the namespace from navigation_interception:: to content:: 3. Change Java package from org.chromium.chrome.browser.components. navigation_interception to org.chromium.content.components. navigation_interception. I will follow up with another patch to completely remove chrome/browser/component/navigation_interception once external dependencies have been updated to use the component at its new component BUG=157575 Review URL: https://chromiumcodereview.appspot.com/11293017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166758 0039d316-1c4b-4281-b951-d872f2087c98
* Expose extra SurfaceTextureBridge methods.sievers@chromium.org2012-11-031-0/+11
| | | | | | | | | | | | Add JNI calls to attach and detach from GL contexts. Also add a function to create a Surface/ANativeWindow for the SurfaceTexture. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=165780 Review URL: https://chromiumcodereview.appspot.com/11315024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165840 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Expose extra SurfaceTextureBridge methods."phajdan.jr@chromium.org2012-11-021-10/+0
| | | | | | | | | | | | This reverts commit c8a6410250f24992ff736733dada1a5050057461. Broke Android compile. BUG= Review URL: https://codereview.chromium.org/11363070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165785 0039d316-1c4b-4281-b951-d872f2087c98
* Expose extra SurfaceTextureBridge methods.sievers@chromium.org2012-11-021-0/+10
| | | | | | | | | | Add JNI calls to attach and detach from GL contexts. Also add a function to create a Surface/ANativeWindow for the SurfaceTexture. Review URL: https://codereview.chromium.org/11315024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165780 0039d316-1c4b-4281-b951-d872f2087c98
* Fix spacing issue in content.gyp.aurimas@chromium.org2012-10-131-1/+1
| | | | | | | | | Fix spacing issue in content/content.gyp. Review URL: https://chromiumcodereview.appspot.com/11086091 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161683 0039d316-1c4b-4281-b951-d872f2087c98
* Make java.gypi use all_dependent_settings for input_jars_pathscjhopman@chromium.org2012-10-091-5/+0
| | | | | | | | | | | | | | | | | | all_dependent_settings is more like the link_settings that we would like to use here. This variable is used by java targets to set the classpath for javac, i.e. to set the libraries that are needed by the target. Use of direct_dependent_settings with export_dependent_settings causes unnecessary duplication of all java dependencies for all of our java library targets. BUG=146049 TBR=sky,brettw Review URL: https://chromiumcodereview.appspot.com/10986094 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160768 0039d316-1c4b-4281-b951-d872f2087c98
* Android: generates JNI bindings for constructors in system classes.bulach@chromium.org2012-09-241-0/+13
| | | | | | | | | | | | This allows to simplify some places such as surface_texture_bridge. BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10968009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158249 0039d316-1c4b-4281-b951-d872f2087c98
* Move gpu blacklist data file to content side.zmo@google.com2012-09-201-1/+1
| | | | | | | | | | | This also fixes the bug that GPU histograms are missing. BUG=151057 TEST=tree R=jbauman Review URL: https://codereview.chromium.org/10911315 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157851 0039d316-1c4b-4281-b951-d872f2087c98
* Upstreaming SelectFileDialog for Androidaurimas@chromium.org2012-09-181-0/+2
| | | | | | | | | | | | Upstreaming the Select File Dialog and its dependencies needed for Chrome on Android BUG=116131 Review URL: https://chromiumcodereview.appspot.com/10916160 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157424 0039d316-1c4b-4281-b951-d872f2087c98
* Remove {base,net}_java dependencies from GYP client targets on Android.pliard@chromium.org2012-09-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | On Android, some GYP client targets were explicitly depending on both the native and Java sides of a library. This removes the dependencies to {base,net}_java and make the native side ('base' and 'net) of these libraries depend on their Java counterpart. On Android it rarely makes sense to depend on a single side of a Java/C++ library. The {base,net}_java can now be considered as "private" targets although GYP does not support this concept unfortunately (AFAICT). Note that I made sure that the resulting APKs' size is unchanged. Additionally, this CL removes 'base_java' (i.e. does not replace it with 'base') from the targets including 'build/apk_test.gypi'. This dependency should not have been there (in the wrong layer) in the first place. It's needed by ChromeNativeTestActivity.java which clients should not know about. BUG=146323 TBR=lipalani,sky,willchan,brettw Review URL: https://chromiumcodereview.appspot.com/10913083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155737 0039d316-1c4b-4281-b951-d872f2087c98
* Add iOS support to content.gypstuartmorgan@chromium.org2012-09-071-235/+272
| | | | | | | | | | | | | | | | | | | | Conditionalizes targets that don't make sense on iOS, and conditionalizes includes of files that have targets that don't make sense on iOS. The component build targets are not changed, since component builds aren't meaningful on iOS. Fixes gyp style to match the rest of Chromium. This doesn't yet build, due to some webkit/ dependencies that need to be resolved. BUG=None Review URL: https://chromiumcodereview.appspot.com/10914145 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155513 0039d316-1c4b-4281-b951-d872f2087c98
* Make java_aidl targets export include directoriescjhopman@chromium.org2012-08-131-0/+2
| | | | | | | | | | | | | | | | | | | Native code generation rules typically add their output directory to their dependent's 'include_dirs'. This change makes targets that include java_aidl.gypi do a similar thing for other java*.gypi targets. Make java.gypi pass this variable to ant and content.xml use the variable rather than hardcoding the directory. Also, move the aidl output folder into <(SHARED_INTERMEDIATE_DIR) as it should be. BUG= Review URL: https://chromiumcodereview.appspot.com/10855060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151315 0039d316-1c4b-4281-b951-d872f2087c98
* Make java.gypi export jar path to input_jars_paths variablecjhopman@chromium.org2012-08-091-0/+4
| | | | | | | | | | | | | | | | | Both java.gypi and apk_test.gypi expect the jar path in input_jars_paths. This means that we were specifying the dependence in both 'dependencies' and 'input_jars_paths'. This change makes it so that we don't need that redundancy. Also, make java.gypi use input_jars_paths in its input so that we actually rebuild targets when we should. BUG=136756 Review URL: https://chromiumcodereview.appspot.com/10837143 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150850 0039d316-1c4b-4281-b951-d872f2087c98
* Remove "chrome" hardcoded suffix from Android .pak path.tedchoc@chromium.org2012-07-171-0/+1
| | | | | | | | | | BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10778023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147043 0039d316-1c4b-4281-b951-d872f2087c98
* Fix Java file generation rule in java_aidl.gypisteveblock@chromium.org2012-07-101-3/+3
| | | | | | | | | | | | | | | | The Java file generation rule in java_aidl.gypi assumes the wrong output path for the generated file. This leads to spurious rebuilds. The problem is that by default, the aidl tool outputs the Java file to <output-path>/<package-path>/<input-file-root>.java, not to <output-path>/<input-file-root>.java as assumed by the rule. This change fixes the problem by explicitly specifying the output path to aidl. Also remove superfluous path components on input files. Review URL: https://chromiumcodereview.appspot.com/10690092 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145982 0039d316-1c4b-4281-b951-d872f2087c98
* Move java files into src parent directory.navabi@google.com2012-06-261-3/+3
| | | | | | | | | | BUG=134704 TEST= TBR=jam@chromium.org Review URL: https://chromiumcodereview.appspot.com/10668039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144272 0039d316-1c4b-4281-b951-d872f2087c98
* Enable incremental linking on browser_tests and unit_tests.jam@chromium.org2012-06-221-0/+9
| | | | | | | This is based off scottmg's https://chromiumcodereview.appspot.com/10572043/ and after r143272. Review URL: https://chromiumcodereview.appspot.com/10644003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143501 0039d316-1c4b-4281-b951-d872f2087c98
* Added sandboxed process service.michaelbai@chromium.org2012-06-121-1/+16
| | | | | | | | | | BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10546079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141618 0039d316-1c4b-4281-b951-d872f2087c98
* Allow for building content_shell from within WebKitjochen@chromium.org2012-05-221-1/+19
| | | | | | | | | BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10388218 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138231 0039d316-1c4b-4281-b951-d872f2087c98
* Android content shell bringup.jrg@chromium.org2012-05-101-16/+6
| | | | | | | | | | | | | | | | | | Build media java files (we weren't). Fix adb_install_content_shell for cases where the app was stuck. Add upstream staging gyp var / #define. Be more consistent about jar output files (all in lib.java). Upstream a bunch of random files (e.g. ppapi). Upstream a bunch of java and native code hit as part of shlib init. Properly package jar files in content shell. BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10377059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136219 0039d316-1c4b-4281-b951-d872f2087c98
generated by cgit v1.1 at 2025-03-01 00:33:29 +0000