content/content_resources.grd - Issue 14834011: Android: use grit target platform instead of define.

Side by Side Diff: content/content_resources.grd

Issue 14834011: Android: use grit target platform instead of define. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add missed pp_ifdef(android) Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2	2

3 <grit latest_public_release="0" current_release="1">	3 <grit latest_public_release="0" current_release="1">

4 <outputs>	4 <outputs>

5 <output filename="grit/content_resources.h" type="rc_header">	5 <output filename="grit/content_resources.h" type="rc_header">

6 <emit emit_type='prepend'></emit>	6 <emit emit_type='prepend'></emit>

7 </output>	7 </output>

8 <output filename="content_resources.pak" type="data_package" />	8 <output filename="content_resources.pak" type="data_package" />

9 <output filename="content_resources.rc" type="rc_all" />	9 <output filename="content_resources.rc" type="rc_all" />

10 </outputs>	10 </outputs>

(...skipping 13 matching lines...) Expand all Loading...
24 <include name="IDR_WEBRTC_INTERNALS_HTML" file="browser/resources/media/we brtc_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />	24 <include name="IDR_WEBRTC_INTERNALS_HTML" file="browser/resources/media/we brtc_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />

25 <include name="IDR_WEBRTC_INTERNALS_JS" file="browser/resources/media/webr tc_internals.js" flattenhtml="true" type="BINDATA" />	25 <include name="IDR_WEBRTC_INTERNALS_JS" file="browser/resources/media/webr tc_internals.js" flattenhtml="true" type="BINDATA" />

26 <if expr="is_macosx">	26 <if expr="is_macosx">

27 <include name="IDR_GPU_SANDBOX_PROFILE" file="browser/gpu.sb" type="BIND ATA" />	27 <include name="IDR_GPU_SANDBOX_PROFILE" file="browser/gpu.sb" type="BIND ATA" />

28 <include name="IDR_WORKER_SANDBOX_PROFILE" file="browser/worker.sb" type ="BINDATA" />	28 <include name="IDR_WORKER_SANDBOX_PROFILE" file="browser/worker.sb" type ="BINDATA" />

29 <include name="IDR_COMMON_SANDBOX_PROFILE" file="common/common.sb" type= "BINDATA" />	29 <include name="IDR_COMMON_SANDBOX_PROFILE" file="common/common.sb" type= "BINDATA" />

30 <include name="IDR_PPAPI_SANDBOX_PROFILE" file="ppapi_plugin/ppapi.sb" t ype="BINDATA" />	30 <include name="IDR_PPAPI_SANDBOX_PROFILE" file="ppapi_plugin/ppapi.sb" t ype="BINDATA" />

31 <include name="IDR_RENDERER_SANDBOX_PROFILE" file="renderer/renderer.sb" type="BINDATA" />	31 <include name="IDR_RENDERER_SANDBOX_PROFILE" file="renderer/renderer.sb" type="BINDATA" />

32 <include name="IDR_UTILITY_SANDBOX_PROFILE" file="utility/utility.sb" ty pe="BINDATA" />	32 <include name="IDR_UTILITY_SANDBOX_PROFILE" file="utility/utility.sb" ty pe="BINDATA" />

33 </if>	33 </if>

34 <if expr="not pp_ifdef('android')">	34 <if expr="not is_android">

35 <include name="IDR_TRACING_HTML" file="../third_party/trace-viewer/src/a bout_tracing.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />	35 <include name="IDR_TRACING_HTML" file="../third_party/trace-viewer/src/a bout_tracing.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />

36 <include name="IDR_TRACING_JS" file="../third_party/trace-viewer/src/abo ut_tracing.js" flattenhtml="true" type="BINDATA" />	36 <include name="IDR_TRACING_JS" file="../third_party/trace-viewer/src/abo ut_tracing.js" flattenhtml="true" type="BINDATA" />

37 </if>	37 </if>

38 </includes>	38 </includes>

39 </release>	39 </release>

40 </grit>	40 </grit>

OLD	NEW

« no previous file with comments | « chrome/renderer/resources/renderer_resources.grd ('k') | ui/base/strings/app_locale_settings.grd » ('j') | no next file with comments »