Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_43355755
engine
提交
7564b7fd
E
engine
项目概览
weixin_43355755
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7564b7fd
编写于
1月 06, 2016
作者:
S
Seigo Nonaka
提交者:
Android (Google) Code Review
1月 06, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge "Fix race condition in Paint.hasGlyph()"
上级
b5aba20c
a6f5c468
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
4 deletion
+14
-4
libs/minikin/Android.mk
libs/minikin/Android.mk
+10
-3
libs/minikin/FontCollection.cpp
libs/minikin/FontCollection.cpp
+1
-0
libs/minikin/MinikinInternal.cpp
libs/minikin/MinikinInternal.cpp
+3
-1
未找到文件。
libs/minikin/Android.mk
浏览文件 @
7564b7fd
...
...
@@ -48,11 +48,18 @@ minikin_shared_libraries := \
libicuuc
\
libutils
ifneq
(,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
# Enable race detection on eng and userdebug build.
enable_race_detection
:=
-DENABLE_RACE_DETECTION
else
enable_race_detection
:=
endif
LOCAL_MODULE
:=
libminikin
LOCAL_EXPORT_C_INCLUDE_DIRS
:=
frameworks/minikin/include
LOCAL_SRC_FILES
:=
$(minikin_src_files)
LOCAL_C_INCLUDES
:=
$(minikin_c_includes)
LOCAL_CPPFLAGS
+=
-Werror
-Wall
-Wextra
LOCAL_CPPFLAGS
+=
-Werror
-Wall
-Wextra
$(enable_race_detection)
LOCAL_SHARED_LIBRARIES
:=
$(minikin_shared_libraries)
include
$(BUILD_SHARED_LIBRARY)
...
...
@@ -64,7 +71,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_EXPORT_C_INCLUDE_DIRS
:=
frameworks/minikin/include
LOCAL_SRC_FILES
:=
$(minikin_src_files)
LOCAL_C_INCLUDES
:=
$(minikin_c_includes)
LOCAL_CPPFLAGS
+=
-Werror
-Wall
-Wextra
LOCAL_CPPFLAGS
+=
-Werror
-Wall
-Wextra
$(enable_race_detection)
LOCAL_SHARED_LIBRARIES
:=
$(minikin_shared_libraries)
include
$(BUILD_STATIC_LIBRARY)
...
...
@@ -77,7 +84,7 @@ LOCAL_MODULE := libminikin_host
LOCAL_MODULE_TAGS
:=
optional
LOCAL_EXPORT_C_INCLUDE_DIRS
:=
frameworks/minikin/include
LOCAL_C_INCLUDES
:=
$(minikin_c_includes)
LOCAL_CPPFLAGS
+=
-Werror
-Wall
-Wextra
LOCAL_CPPFLAGS
+=
-Werror
-Wall
-Wextra
$(enable_race_detection)
LOCAL_SHARED_LIBRARIES
:=
liblog libicuuc-host
LOCAL_SRC_FILES
:=
Hyphenator.cpp
...
...
libs/minikin/FontCollection.cpp
浏览文件 @
7564b7fd
...
...
@@ -227,6 +227,7 @@ bool FontCollection::hasVariationSelector(uint32_t baseCodepoint,
// Currently mRanges can not be used here since it isn't aware of the variation sequence.
// TODO: Use mRanges for narrowing down the search range.
for
(
size_t
i
=
0
;
i
<
mFamilies
.
size
();
i
++
)
{
AutoMutex
_l
(
gMinikinLock
);
if
(
mFamilies
[
i
]
->
hasVariationSelector
(
baseCodepoint
,
variationSelector
))
{
return
true
;
}
...
...
libs/minikin/MinikinInternal.cpp
浏览文件 @
7564b7fd
...
...
@@ -25,7 +25,9 @@ namespace android {
Mutex
gMinikinLock
;
void
assertMinikinLocked
()
{
LOG_FATAL_IF
(
gMinikinLock
.
tryLock
()
==
0
);
#ifdef ENABLE_RACE_DETECTION
LOG_ALWAYS_FATAL_IF
(
gMinikinLock
.
tryLock
()
==
0
);
#endif
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录