Skip to content

Commit c2088e1

Browse files
Kudofacebook-github-bot
authored andcommitted
revert #33381 changes (#33973)
Summary: facebook/yoga#1150 is better than the tricky #33381 and fix the build error on react-native 0.69 with swift clang module. as facebook/yoga#1150 is landed as 43f831b, i'm reverting the previous change, only leaving the necessary react_native_pods.rb change. ## Changelog [iOS] [Changed] - Better fix for yoga + swift clang module build error Pull Request resolved: #33973 Test Plan: ci passed Reviewed By: cortinico, cipolleschi Differential Revision: D36998007 Pulled By: dmitryrykun fbshipit-source-id: fa11bd950e2a1be6396f286086f4e7941ad2ff5b
1 parent 2f940db commit c2088e1

File tree

3 files changed

+5
-46
lines changed

3 files changed

+5
-46
lines changed

ReactCommon/yoga/Yoga-umbrella.h

Lines changed: 0 additions & 21 deletions
This file was deleted.

ReactCommon/yoga/Yoga.modulemap

Lines changed: 0 additions & 6 deletions
This file was deleted.

ReactCommon/yoga/Yoga.podspec

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,25 +47,11 @@ Pod::Spec.new do |spec|
4747

4848
# Set this environment variable when *not* using the `:path` option to install the pod.
4949
# E.g. when publishing this spec to a spec repo.
50-
source_files = 'yoga/**/*.{cpp,h}', 'Yoga-umbrella.h'
51-
source_files = source_files.map { |file| File.join('ReactCommon/yoga', file) } if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
50+
source_files = 'yoga/**/*.{cpp,h}'
51+
source_files = File.join('ReactCommon/yoga', source_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
5252
spec.source_files = source_files
5353

54-
spec.module_map = 'Yoga.modulemap'
55-
56-
# CocoaPods custom `module_map` + `header_dir` doesn't put the umbrella header in right place.
57-
# Ideally, modulemap should be placed with the umbrella header, that would work for both use_frameworks! mode and non use_frameworks! mode.
58-
# This script copy the umbrella header back to right place.
59-
spec.script_phase = {
60-
:name => 'Copy umbrella header',
61-
:input_files => ["$PODS_ROOT/Headers/Public/Yoga/yoga/Yoga-umbrella.h"],
62-
:output_files => ["$PODS_ROOT/Headers/Private/Yoga/Yoga-umbrella.h"],
63-
:execution_position => :before_compile,
64-
:shell_path => '/bin/bash',
65-
66-
# In use_frameworks! mode, the umbrella header will by copied to right place.
67-
# This copy command will fail because "$PODS_ROOT/Headers/Public/Yoga/yoga/Yoga-umbrella.h" doesn't exist.
68-
# The command is just a no-op in use_frameworks! mode.
69-
:script => 'cp -f "$PODS_ROOT/Headers/Public/Yoga/yoga/Yoga-umbrella.h" "$PODS_ROOT/Headers/Private/Yoga/Yoga-umbrella.h" || true',
70-
}
54+
header_files = 'yoga/*.h'
55+
header_files = File.join('ReactCommon/yoga', header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
56+
spec.public_header_files = header_files
7157
end

0 commit comments

Comments
 (0)