Releases/m71 #3

SergioOpenPeer · 2019-01-18T22:09:44Z

No description provided.

Rejected patch: `ortclib-sdk/webrtc/xplatform/chromium/build/config/compiler/BUILD.gn` ````diff diff a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn (rejected hunks) @@ -104,6 +104,9 @@ declare_args() { # on by default when goma is enabled because setting this to true may make # it harder to debug binaries. strip_absolute_paths_from_debug_symbols = false + + # WebRTC does not want to switch to C++14 yet. + use_cxx11 = true } if (is_clang && !is_nacl) { ````

… chromium build

…eleases/m62

…arget_cpu. Removed link flag /DYNAMICBASE:NO in debug configuration for arm and arm64. Removed simd/jsimd_arm.C and simd/jsimd_arm_neon.S files from sources for arm and arm64 for winuwp target. Disabled warning 4267 for arm and arm64. By default it was disabled for x64.

…development environment, for x86 (task #246)

…m-merge' into releases/m62

…/m66 # Conflicts: # config/win/BUILD.gn # toolchain/win/BUILD.gn # toolchain/win/setup_toolchain.py # vs_toolchain.py

… confing/compiler/BUILD.gn when /Zi build option is removed when clang is used!

…23-winuwp-arm # Conflicts: # config/BUILDCONFIG.gn # config/win/BUILD.gn # toolchain/win/BUILD.gn # toolchain/win/setup_toolchain.py

…nuwp that was applied to wrong branch

…-arm # Conflicts: # config/win/BUILD.gn # toolchain/win/BUILD.gn

…m66-msidl-arm

…/m71 # Conflicts: # .gitignore # config/BUILDCONFIG.gn # config/compiler/BUILD.gn # config/win/BUILD.gn # secondary/testing/gmock/BUILD.gn # secondary/testing/gtest/BUILD.gn # secondary/third_party/libjpeg_turbo/BUILD.gn # toolchain/win/BUILD.gn # toolchain/win/setup_toolchain.py # vs_toolchain.py

/Z7 flag is removed for arm and arm64 when project is built with clang-cl Temporary /EHs-c- is used for arm and arm64 when project is built with clang-cl

Updated cc and ccx tools to support arm64.

….exe and for linking lld-link.exe

robin-raymond · 2019-01-19T13:43:22Z

config/compiler/BUILD.gn

@@ -1781,7 +1781,7 @@ config("no_size_t_to_int_warning") {
 # Code that currently generates warnings for this can include this
 # config to disable them.
 config("no_shorten_64_warnings") {
-  if (current_cpu == "x64") {
+  if (current_cpu == "x64" || current_cpu == "arm" || current_cpu == "arm64") {


Are you sure about the "arm" -- seems to me this should only be arm64.

It was added because of compiler warning 4267 (conversion from 'size_t' to 'type', possible loss of data). Warning is generated for arm and arm64 builds, so it should be added. It could be put in another config.

Yes but does it apply to arm? seems to me this is only arm64, no?

config/compiler/BUILD.gn

robin-raymond · 2019-01-19T13:45:52Z

config/sysroot.gni

-                    [ rebase_path(sysroot) ],
-                    "string") == "True",
-        "Missing sysroot ($sysroot). To fix, run: build/linux/sysroot_scripts/install-sysroot.py --arch=$_script_arch")
+    if (exec_script("//build/dir_exists.py", [ rebase_path(sysroot) ], "string") != "True") {


Is this something that we'd be able to push back to google? If not, we will need to change this...

That is added because of broken preparation for Linux x86. Not sure if this fix is still required.

Can you see if "official" has resolved this issue?

robin-raymond · 2019-01-19T13:47:33Z

config/win/BUILD.gn

    ]
+
+    #TEMPORARY!!! Clang-cl.exe missing unwind support for Windows arm and arm64. This will generate errors in places where try/catch are used


Please rephrase in a way that we can push back to google. It's okay to say this can be removed once clang-cl.exe has a feature but better to phrase properly for something we can push as I intend to push it.

This is something that definitely shouldn't be pushed to Google. Added just to see what other issues exist for arm and arm64.

Need it in such a way that I can submit to google. We don't want to have differences we can't submit back.

robin-raymond · 2019-01-19T13:49:03Z

config/win/BUILD.gn

@@ -376,6 +387,20 @@ config("common_linker_setup") {
    "/DYNAMICBASE",
  ]

+  # ASLR makes debugging with windbg difficult because Chrome.exe and


How did you find this information about chrome? just wondering where it came from

That is Google comment and it was present in older version of that file. I believe that is from m62.

robin-raymond · 2019-01-19T13:54:20Z

toolchain/win/BUILD.gn

+      } else {
+        rspfile = "{{output}}.rsp"
+        command = "$env_wrapper$cl /nologo /showIncludes ${clflags} @$rspfile /c {{source}} /Fo{{output}} /Fd\"$pdbname\""
+        rspfile_content = "$sys_include_flags{{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}}"


rsp consistency ?

robin-raymond · 2019-01-19T13:55:20Z

toolchain/win/BUILD.gn

+      else if (toolchain_args.current_cpu == "arm"){
+        ml = "armasm.exe"
+      } else {
+        ml = "armasm64.exe"


I think it needs to be an explicit check for arm64 in case another CPU is ever added.

maybe assert "Unsupported CPU tartget"

robin-raymond · 2019-01-19T13:56:52Z

toolchain/win/setup_toolchain.py

@@ -276,7 +276,8 @@ def q(s):  # Quote s if it contains spaces or other weird characters.
  print 'vc_lib_path = ' + gn_helpers.ToGNString(vc_lib_path)
  if (target_store != True):
    # Path is assumed not to exist for desktop applications
-    assert vc_lib_atlmfc_path
+    if (cpu != 'arm' and cpu != 'arm64'):


Make sure this is ok for other non uwp builds.

robin-raymond · 2019-01-19T13:57:42Z

vs_toolchain.py

@@ -190,8 +190,12 @@ def _CopyUCRTRuntime(target_dir, source_dir, target_cpu, dll_pattern, suffix):
      os.environ.get('WINDOWSSDKDIR',
                     os.path.expandvars('%ProgramFiles(x86)%'
                                        '\\Windows Kits\\10')))
-  ucrt_dll_dirs = os.path.join(win_sdk_dir, 'Redist', 'ucrt', 'DLLs',
-                               target_cpu)
+  if target_cpu != 'arm64':


I'd make this an explicit == 'arm64' then default to standard behaviour.

robin-raymond · 2019-01-19T13:58:14Z

vs_toolchain.py

@@ -250,6 +256,8 @@ def _CopyPGORuntime(target_dir, target_cpu):
      source = os.path.join(pgo_x86_runtime_dir, runtime)
    elif target_cpu == 'x64':
      source = os.path.join(pgo_x64_runtime_dir, runtime)
+    elif target_cpu == 'arm':


No arm64 needed?

robin-raymond · 2019-01-22T13:53:03Z

config/compiler/BUILD.gn

@@ -1781,7 +1781,7 @@ config("no_size_t_to_int_warning") {
 # Code that currently generates warnings for this can include this
 # config to disable them.
 config("no_shorten_64_warnings") {
-  if (current_cpu == "x64") {
+  if (current_cpu == "x64" || current_cpu == "arm" || current_cpu == "arm64") {


Yes but does it apply to arm? seems to me this is only arm64, no?

robin-raymond · 2019-01-22T13:53:33Z

config/sysroot.gni

-                    [ rebase_path(sysroot) ],
-                    "string") == "True",
-        "Missing sysroot ($sysroot). To fix, run: build/linux/sysroot_scripts/install-sysroot.py --arch=$_script_arch")
+    if (exec_script("//build/dir_exists.py", [ rebase_path(sysroot) ], "string") != "True") {


Can you see if "official" has resolved this issue?

robin-raymond · 2019-01-22T13:54:09Z

config/win/BUILD.gn

    ]
+
+    #TEMPORARY!!! Clang-cl.exe missing unwind support for Windows arm and arm64. This will generate errors in places where try/catch are used


Need it in such a way that I can submit to google. We don't want to have differences we can't submit back.

robin-raymond · 2019-01-22T13:55:03Z

config/win/BUILD.gn

@@ -421,7 +446,7 @@ config("default_crt") {
      configs = [ ":dynamic_crt" ]
    } else {
      # Desktop Windows: static CRT.
-      configs = [ ":static_crt" ]
+      configs = [ ":dynamic_crt" ]


No idea why it changed for winuwp; probably a reason but I don't know what it would be; it's been a LONG time like this...

#3 #4

webrtc-uwp/chromium-build#3 webrtc-uwp/chromium-build#4

Sergej/20181206 m71 python

Sergej/20190212 m71 arm

…-net

Robin/m71 dot net

This change builds maven modules for Cronet. Each maven module includes: 1. POM file defining module and listing dependent modules 2. Jars 3. Proguard files (optional) 4. Native libraries (optional) 5. Resources (optional) 6. Javadocs (optional) We build four maven modules: 1. cronet-api: the Cronet API 2. cronet-embedded: the Cronet native implementation 3. cronet-fallback: the Cronet fallback implementation 4. cronet-common: Cronet implementation in common with #3 and #4 To test the maven modules, this change builds the Cronet sample app using gradle. You can install and run the resulting app by: ninja -C out/Debug cronet_maven_test_build adb install -r out/Debug/cronet_maven/test/build/outputs/apk/debug/test-debug.apk adb install -r out/Debug/cronet_maven/test/build/outputs/apk/androidTest/debug/test-debug-androidTest.apk adb shell am instrument -w org.chromium.cronet_sample_apk.test/android.support.test.runner.AndroidJUnitRunner Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet Change-Id: I5ed27e86f3e01dc3a6441ab449bbe942553343af Reviewed-on: https://chromium-review.googlesource.com/998019 Commit-Queue: Paul Jensen <[email protected]> Reviewed-by: Andrei Kapishnikov <[email protected]> Reviewed-by: Eric Stevenson <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#554608} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 10f4dd8996fe4a028ee2aa61cdf84ad4080ef31c

…with gradle" This reverts commit 10f4dd8996fe4a028ee2aa61cdf84ad4080ef31c. Reason for revert: Build failures on 3 bots BUG=838082 Original change's description: > [Cronet] Build maven modules and test by building sample app with gradle > > This change builds maven modules for Cronet. > Each maven module includes: > 1. POM file defining module and listing dependent modules > 2. Jars > 3. Proguard files (optional) > 4. Native libraries (optional) > 5. Resources (optional) > 6. Javadocs (optional) > We build four maven modules: > 1. cronet-api: the Cronet API > 2. cronet-embedded: the Cronet native implementation > 3. cronet-fallback: the Cronet fallback implementation > 4. cronet-common: Cronet implementation in common with #3 and #4 > > To test the maven modules, this change builds the Cronet sample app using gradle. > You can install and run the resulting app by: > ninja -C out/Debug cronet_maven_test_build > adb install -r out/Debug/cronet_maven/test/build/outputs/apk/debug/test-debug.apk > adb install -r out/Debug/cronet_maven/test/build/outputs/apk/androidTest/debug/test-debug-androidTest.apk > adb shell am instrument -w org.chromium.cronet_sample_apk.test/android.support.test.runner.AndroidJUnitRunner > > Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet > Change-Id: I5ed27e86f3e01dc3a6441ab449bbe942553343af > Reviewed-on: https://chromium-review.googlesource.com/998019 > Commit-Queue: Paul Jensen <[email protected]> > Reviewed-by: Andrei Kapishnikov <[email protected]> > Reviewed-by: Eric Stevenson <[email protected]> > Cr-Commit-Position: refs/heads/master@{#554608} [email protected],[email protected],[email protected] # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: I2779ce28f4df2b8dfe8dd2fcf5fc5a3a850c8ee0 Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet Reviewed-on: https://chromium-review.googlesource.com/1034534 Reviewed-by: Anita Woodruff <[email protected]> Commit-Queue: Anita Woodruff <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#554723} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: ab3426de8a278364703d1023b946cb2cc6ff23f7

…with gradle" This is a reland of 10f4dd8996fe4a028ee2aa61cdf84ad4080ef31c I disabled the gradle build when !use_platform_icu_alternatives so Android bots continue to build successfully. I also moved cronet_maven/ output directory to cronet/maven/ so it can be uploaded by the bots. Original change's description: > [Cronet] Build maven modules and test by building sample app with gradle > > This change builds maven modules for Cronet. > Each maven module includes: > 1. POM file defining module and listing dependent modules > 2. Jars > 3. Proguard files (optional) > 4. Native libraries (optional) > 5. Resources (optional) > 6. Javadocs (optional) > We build four maven modules: > 1. cronet-api: the Cronet API > 2. cronet-embedded: the Cronet native implementation > 3. cronet-fallback: the Cronet fallback implementation > 4. cronet-common: Cronet implementation in common with #3 and #4 > > To test the maven modules, this change builds the Cronet sample app using gradle. > You can install and run the resulting app by: > ninja -C out/Debug cronet_maven_test_build > adb install -r out/Debug/cronet_maven/test/build/outputs/apk/debug/test-debug.apk > adb install -r out/Debug/cronet_maven/test/build/outputs/apk/androidTest/debug/test-debug-androidTest.apk > adb shell am instrument -w org.chromium.cronet_sample_apk.test/android.support.test.runner.AndroidJUnitRunner > > Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet > Change-Id: I5ed27e86f3e01dc3a6441ab449bbe942553343af > Reviewed-on: https://chromium-review.googlesource.com/998019 > Commit-Queue: Paul Jensen <[email protected]> > Reviewed-by: Andrei Kapishnikov <[email protected]> > Reviewed-by: Eric Stevenson <[email protected]> > Cr-Commit-Position: refs/heads/master@{#554608} Change-Id: Ieba6842b48d0b8e97ca1dc6686080cb31a87ed95 Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet [email protected] Eric already approved the build/ change in https://chromium-review.googlesource.com/998019 Change-Id: Ieba6842b48d0b8e97ca1dc6686080cb31a87ed95 Reviewed-on: https://chromium-review.googlesource.com/1037723 Commit-Queue: Paul Jensen <[email protected]> Reviewed-by: Eric Stevenson <[email protected]> Reviewed-by: Andrei Kapishnikov <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#555157} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 5ff415959d5ef4d105cda4cd4fe36f06107f54b9

Use a new `std_cpp17` argument in Windows builds to enable forcing Win32 MSVC builds to use `/std:c++17`. This is already forced for UWP, but is needed for Win32 if a module compiled with C++17 needs to link against the `webrtc.lib` compiled from this repository. Otherwise the layout mismatch between `absl::optional` (non-c++17) and `std::optional` (c++17) produces a link error.

Enable forcing `/std:c++17` via GN argument

robin-raymond and others added 30 commits October 6, 2017 11:15

Updated vs_toolchain.py file to support VS2017

de13037

Set proper include paths for ninja files for x64 platform.

8b4c5bf

Set proper include paths for ninja files for x86 platform.

29c9904

Changes to pass WACK and run on Xbox

acffe89

Replaced usage of system drive with appropriate environment variables

9b0c7e4

Added .gitignore

b8cc22a

Sync chromium/build with changes to be upstreamed to google

9851a7e

- fixed incorrect comment regarding toolchain setup

64a61fb

Sync with chromium code which reformated some of the upload to google…

179bc02

… chromium build

fix for broken prepare for x86 on linux.

6bbd16d

Merge remote-tracking branch 'origin/Robin/m62-chromium-build' into r…

8564530

…eleases/m62

Fix for prepare issue on linux x86.

a1534f6

Created winuwp_arm64 toolchain

bb7e263

applied accepted chromium build changes to uwp build

da87ccc

applied accepted chromium build changes to uwp build

8057d7a

Added Microsoft ARM assembler for asm tool

9603dd0

Updated input parameters for armasm compiler

698ec30

fix for undefined identifier cflags_cc.

feea555

Fix for "Unresolved dependencies" during preparation phase of WebRTC …

751c5ad

…development environment, for x86 (task #246)

merged latest changes from google push to fixes branch

e8c23ed

Added armasm64 compiler for windows arm64 platform

1fc19f3

merged latest changes from google push to fixes branch

45c72c4

Merge remote-tracking branch 'origin/Vladimir/test-second-m62-chromiu…

dfa8786

…m-merge' into releases/m62

Merge commit 'dfa87867bab17cbac1e23af42831632147f89c15' into releases…

5b0d5bd

…/m66 # Conflicts: # config/win/BUILD.gn # toolchain/win/BUILD.gn # toolchain/win/setup_toolchain.py # vs_toolchain.py

Resolved winuwp arm build issues when used clang-cl. Pay attention on…

be194b2

… confing/compiler/BUILD.gn when /Zi build option is removed when clang is used!

Merge remote-tracking branch 'origin/releases/m62' into Sergej/201803…

fae04de

…23-winuwp-arm # Conflicts: # config/BUILDCONFIG.gn # config/win/BUILD.gn # toolchain/win/BUILD.gn # toolchain/win/setup_toolchain.py

- reapply change to remove defines += [ "_USING_V110_SDK71_" ] for wi…

2e8dba4

…nuwp that was applied to wrong branch

cannot build unless default libs are dynamicly link

c52de61

vmancic and others added 13 commits July 12, 2018 17:03

Merge remote-tracking branch 'origin/Robin/m62-arm' into Vladimir/m66…

b5211f9

…-arm # Conflicts: # config/win/BUILD.gn # toolchain/win/BUILD.gn

Merge remote-tracking branch 'origin/Vladimir/m66-arm' into Vladimir/…

794296b

…m66-msidl-arm

missing } in BUILD.GN

cba7ef1

removed code for goma check that is no longer needed

f0ce0a7

support for arm build with win targets

9941608

removed ZW compilation option

170c225

fixed uwp clang default toolchain

0946a25

cflag_cc - added /ZW when built for winuwp with ms compiler

f80b444

Removed /ZW because winrt code is not supported anymore

8ba9407

Updated cc and ccx tools to support arm64.

b32cf47

/Z7 flag is removed for arm and arm64 when project is built with clang-cl Temporary /EHs-c- is used for arm and arm64 when project is built with clang-cl

Merge pull request #2 from webrtc-uwp/Sergej/20181206-m71-python

9407778

Updated cc and ccx tools to support arm64.

Fixed potential linker issue when for building is used Microsoft's cl…

ffa7641

….exe and for linking lld-link.exe

SergioOpenPeer requested a review from robin-raymond January 18, 2019 22:09

robin-raymond requested changes Jan 19, 2019

View reviewed changes

robin-raymond requested changes Jan 22, 2019

View reviewed changes

Made changes based on comments for PRs:

a6ce039

#3 #4

SergioOpenPeer pushed a commit to webrtc-uwp/webrtc-uwp-sdk that referenced this pull request Jan 22, 2019

Made changes based on comments for PRs:

8462f33

webrtc-uwp/chromium-build#3 webrtc-uwp/chromium-build#4

Sergej Jovanovic and others added 7 commits January 22, 2019 21:55

Merge pull request #5 from webrtc-uwp/Sergej/20181206-m71-python

4e120bb

Sergej/20181206 m71 python

Update arm assembly build action in win build toolchain

4ea2218

Updated asm tool to support clang-cl and armasm.

0139ca4

Merge pull request #6 from webrtc-uwp/Sergej/20190212-m71-arm

916dd19

Sergej/20190212 m71 arm

added cpp17 flags to build engine

8d91370

Merge remote-tracking branch 'origin/releases/m71' into Robin/m71-dot…

f0e0893

…-net

Merge pull request #7 from webrtc-uwp/Robin/m71-dot-net

ce61deb

Robin/m71 dot net

djee-ms and others added 2 commits June 14, 2019 17:29

Merge pull request #8 from djee-ms/stdcpp17

495bba6

Enable forcing `/std:c++17` via GN argument

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Releases/m71 #3

Releases/m71 #3

SergioOpenPeer commented Jan 18, 2019

robin-raymond Jan 19, 2019

SergioOpenPeer Jan 22, 2019

robin-raymond Jan 22, 2019

robin-raymond Jan 19, 2019

SergioOpenPeer Jan 22, 2019

robin-raymond Jan 22, 2019

robin-raymond Jan 19, 2019

SergioOpenPeer Jan 22, 2019

robin-raymond Jan 22, 2019

robin-raymond Jan 19, 2019

SergioOpenPeer Jan 22, 2019

robin-raymond Jan 19, 2019

robin-raymond Jan 19, 2019

robin-raymond Jan 19, 2019

SergioOpenPeer Jan 22, 2019

robin-raymond Jan 19, 2019

robin-raymond Jan 19, 2019

SergioOpenPeer Jan 22, 2019

robin-raymond Jan 19, 2019

SergioOpenPeer Jan 22, 2019

robin-raymond Jan 22, 2019

robin-raymond Jan 22, 2019

robin-raymond Jan 22, 2019

robin-raymond Jan 22, 2019

		]

		#TEMPORARY!!! Clang-cl.exe missing unwind support for Windows arm and arm64. This will generate errors in places where try/catch are used

Releases/m71 #3

Are you sure you want to change the base?

Releases/m71 #3

Conversation

SergioOpenPeer commented Jan 18, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment